hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit bffcf03d602ea0697439b6e6f5749289260b88be
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Wed Jun 17 18:03:17 2009 +0200

    fix ogg vorbis capability of Android phones
    
    The 0xc02 can do ogg vorbis as well; this is a feature of Android OS, not the
    particular hw device. Set ogg vorbis capability for other Android phones as
    well.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 03ffdf4..99d36b1 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -1002,9 +1002,6 @@
           <!-- Android Phone, HTC Diamond -->
           <match key="@storage.originating_device:usb.product_id" int_outof="0xc01;0xc02;0xc13">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-             <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>
@@ -1012,6 +1009,7 @@
              <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</append>
              <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
           </match>
 	  <!-- Windows Mobile PPC HTC Touch HD -->