hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 858895cf8ec763f68ae1171cbba75f258566acd0
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 29 18:50:49 2008 +0100

    set ogg support only for Android (HTC G1)
    
    Set ogg support only for Android (HTC G1), other Windows-Mobile based
    HTC devices need special software to play ogg.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index a98bd10..75cdcaa 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -904,7 +904,9 @@
           <!-- Android Phone, HTC Diamond -->
           <match key="@storage.originating_device:usb.product_id" int_outof="0xc01;0xc13">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+             <match key="@storage.originating_device:usb.product_id" int="0xc01">
+	       <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+	     </match>
              <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>