From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 9 May 2016 11:52:11 +0000 (+0200)
Subject: More mimetypes reordering, comments and additions
X-Git-Tag: archive/raspbian/2.2.6-5+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=df636c02f6d6cb3afb12b66bf4b1207267059b82;p=vlc.git

More mimetypes reordering, comments and additions


Gbp-Pq: Name 0007-More-mimetypes-reordering-comments-and-additions.patch
---

diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
index 3ce8bb92..e33de408 100644
--- a/share/vlc.desktop.mimetypes
+++ b/share/vlc.desktop.mimetypes
@@ -10,6 +10,8 @@ audio/x-vorbis+ogg
 video/ogg                        # IANA-registered
 video/x-ogm+ogg
 video/x-theora+ogg
+video/x-theora
+audio/x-speex
 
 # FLAC lossless audio
 application/x-flac
@@ -38,7 +40,8 @@ video/vnd.divx
 video/x-avi
 
 # Real audio and video
-application/vnd.rn-realmedia
+application/vnd.rn-realmedia     # RM
+application/vnd.rn-realmedia-vbr # RMVB
 audio/vnd.rn-realaudio
 audio/x-pn-realaudio
 audio/x-pn-realaudio-plugin
@@ -48,10 +51,16 @@ video/vnd.rn-realvideo
 
 # MPEG related audio, video and transport
 # MPEG-2
-audio/mp2
 audio/mpeg                       # IANA-registered
+audio/mpg                       # IANA-registered
+audio/mp1
+audio/mp2
+audio/mp3
+audio/x-mp1
+audio/x-mp2
 audio/x-mp3
 audio/x-mpeg
+audio/x-mpg
 video/mp2t                       # TS
 video/mpeg
 video/mpeg-system
@@ -63,9 +72,11 @@ application/mpeg4-iod            # IANA-registered
 application/mpeg4-muxcodetable
 application/x-extension-m4a
 application/x-extension-mp4
+audio/aac
 audio/m4a
 audio/mp4                        # IANA-registered
 audio/x-m4a
+audio/x-aac
 video/mp4                        # IANA-registered
 video/mp4v-es
 video/x-m4v
@@ -115,11 +126,13 @@ x-content/audio-player
 application/xspf+xml
 audio/mpegurl
 audio/x-mpegurl
+audio/scpls
 audio/x-scpls
 video/vnd.mpegurl                # IANA-registered
 application/vnd.apple.mpegurl    # HLS / M3U8
 application/vnd.ms-asf           # ZPL/WVX
 application/vnd.ms-wpl           # WPL
+application/sdp                  # SDP for RT*P
 
 # Digital Video
 video/dv
@@ -145,6 +158,20 @@ audio/x-pn-au
 audio/x-pn-wav
 audio/x-wav
 
+# Raw audio
+audio/ac3
+audio/vnd.dts           # IANA DTS Audio
+audio/vnd.dts.hd        # IANA DTS-HD
+audio/basic             # IANA mulaw
+audio/midi
+# Weird audio formats
+audio/x-ape
+audio/x-gsm
+audio/x-musepack
+audio/x-tta
+audio/x-wavpack
+audio/x-shorten
+
 # Adobe Flash player related
 application/x-shockwave-flash
 application/x-flash-video
@@ -164,24 +191,14 @@ audio/x-xm
 # From the totem desktop file in Debian.  These need more work.
 application/mxf
 #application/ram
-application/sdp
 #application/smil
 #application/smil+xml
 #application/x-netshow-channel
 #application/x-shorten
 #application/x-smil
-audio/ac3
-#audio/basic
-#audio/midi
 #audio/prs.sid
-audio/x-ape
-audio/x-gsm
-audio/x-musepack
 #audio/x-sbc
-audio/x-speex
 #audio/x-stm
-audio/x-tta
-audio/x-wavpack
 #image/x-pict
 #text/google-video-pointer
 #text/x-google-video-pointer
@@ -192,3 +209,10 @@ audio/x-wavpack
 #x-scheme-handler/net
 #x-scheme-handler/pnm
 #x-scheme-handler/uvox
+#
+#application/streamingmedia
+#application/x-streamingmedia
+#audio/rn-mpeg
+#audio/x-pn-windows-pcm
+#video/x-ms-afs
+#video/x-ms-wvxvideo