From: Petter Reinholdtsen <pere@hungry.com>
Date: Tue, 10 May 2016 11:19:43 +0000 (+0200)
Subject: desktop file: We understand gvp and ram format
X-Git-Tag: archive/raspbian/2.2.6-5+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d5e30687d11b110bfd425c4f03ee14a376b18cd;p=vlc.git

desktop file: We understand gvp and ram format

And add more comments about IANA registration

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Gbp-Pq: Name 0008-desktop-file-We-understand-gvp-and-ram-format.patch
---

diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
index e33de408..d7081f92 100644
--- a/share/vlc.desktop.mimetypes
+++ b/share/vlc.desktop.mimetypes
@@ -123,11 +123,14 @@ x-content/audio-cdda
 x-content/audio-player
 
 # Playlists / text/xml list with URLs
+application/ram                # Realaudio Metadata
 application/xspf+xml
 audio/mpegurl
 audio/x-mpegurl
 audio/scpls
 audio/x-scpls
+text/google-video-pointer
+text/x-google-video-pointer
 video/vnd.mpegurl                # IANA-registered
 application/vnd.apple.mpegurl    # HLS / M3U8
 application/vnd.ms-asf           # ZPL/WVX
@@ -189,21 +192,18 @@ audio/x-s3m
 audio/x-xm
 
 # From the totem desktop file in Debian.  These need more work.
-application/mxf
-#application/ram
-#application/smil
-#application/smil+xml
+application/mxf                 # IANA-registered
+#application/smil               # IANA-registered
+#application/smil+xml           # IANA-registered
 #application/x-netshow-channel
 #application/x-shorten
 #application/x-smil
-#audio/prs.sid
+#audio/prs.sid                  # IANA-registered
 #audio/x-sbc
 #audio/x-stm
 #image/x-pict
-#text/google-video-pointer
-#text/x-google-video-pointer
 #video/vivo
-#video/vnd.vivo
+#video/vnd.vivo                 # IANA-registered
 #video/x-flic
 #video/x-totem-stream
 #x-scheme-handler/net