hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 1f3b818ace1e7f7535dc44d2646e355bbc3e1fff
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Nov 19 07:18:48 2007 +0100

    fixed some USB music player entries
    
    Fixes some music player entries. Don't add portable_audio_player.output_formats
    with value audio/mpeg to music players. This get added at the end automatically.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ce155c0..d16f8d7 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -92,7 +92,6 @@
           <match key="@storage.originating_device:usb.product_id" int="0x0702">
             <merge key="portable_audio_player.type" type="string">generic</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">video/x-ms-asf</append>
@@ -524,7 +523,6 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-amr</append>
 	  </match>