[vlc-commits] NPVLC: add some mimetypes
Jean-Baptiste Kempf
git at videolan.org
Sat Apr 23 12:40:26 CEST 2011
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr 23 12:39:54 2011 +0200| [40164e1b7c4b59d73c57a7857b1a476466710f39] | committer: Jean-Baptiste Kempf
NPVLC: add some mimetypes
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=40164e1b7c4b59d73c57a7857b1a476466710f39
---
projects/mozilla/npvlc_rc.rc.in | 6 +++---
projects/mozilla/vlc.r.in | 4 ++++
projects/mozilla/vlcplugin.h | 2 ++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/projects/mozilla/npvlc_rc.rc.in b/projects/mozilla/npvlc_rc.rc.in
index cb536e7..b186a92 100644
--- a/projects/mozilla/npvlc_rc.rc.in
+++ b/projects/mozilla/npvlc_rc.rc.in
@@ -31,9 +31,9 @@ BEGIN
VALUE "InternalName", "npvlc\0"
VALUE "CompanyName", "the VideoLAN Team\0"
VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ The VideoLAN Team\0"
- VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mp4|audio/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|application/x-google-vlc-plugin|audio/wav|audio/x-wav|audio/3gpp|video/3gpp|audio/3gpp2|video/3gpp2|video/divx|video/flv|video/x-flv|video/x-matroska|audio/x-matroska|application/xspf+xml|audio/x-m4a|audio/x-mpegurl|audio/x-ms-wma|video/webm|audio/webm|audio/amr\0"
- VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|ogg|vlc|asf,asx|asf,asx||wmv||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka|xspf|m4a|m3u|wma|webm|webm|amr\0"
- VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|Ogg stream|VLC plug-in|Windows Media video|Windows Media video|Windows Media plug-in|Windows Media video|Google VLC plug-in|WAV audio|WAV audio|3GPP audio|3GPP video|3GPP2 audio|3GPP2 video|DivX video|FLV video|FLV video|Matroska video|Matroska audio|Playlist xspf|MPEG-4 audio|Playlist M3U|Windows Media Audio|WebM video|WebM audio|AMR audio\0"
+ VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mp4|audio/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-m4v|video/x-msvideo|video/quicktime|application/x-ogg|application/ogg|video/ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|application/x-google-vlc-plugin|audio/wav|audio/x-wav|audio/3gpp|video/3gpp|audio/3gpp2|video/3gpp2|video/divx|video/flv|video/x-flv|video/x-matroska|audio/x-matroska|application/xspf+xml|audio/x-m4a|audio/x-mpegurl|audio/x-ms-wma|video/webm|audio/webm|audio/amr\0"
+ VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|m4v|avi|mov,qt|ogg|ogg|ogv|vlc|asf,asx|asf,asx||wmv||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka|xspf|m4a|m3u|wma|webm|webm|amr\0"
+ VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|Ogg stream|Ogg video|VLC plug-in|Windows Media video|Windows Media video|Windows Media plug-in|Windows Media video|Google VLC plug-in|WAV audio|WAV audio|3GPP audio|3GPP video|3GPP2 audio|3GPP2 video|DivX video|FLV video|FLV video|Matroska video|Matroska audio|Playlist xspf|MPEG-4 audio|Playlist M3U|Windows Media Audio|WebM video|WebM audio|AMR audio\0"
END
END
BLOCK "VarFileInfo"
diff --git a/projects/mozilla/vlc.r.in b/projects/mozilla/vlc.r.in
index 8da6d5a..c8d911f 100644
--- a/projects/mozilla/vlc.r.in
+++ b/projects/mozilla/vlc.r.in
@@ -35,6 +35,7 @@ resource 'STR#' (127)
"MPEG-4 audio",
"MPEG-4 video",
"MPEG-4 video",
+ "MPEG-4 video",
/* AVI */
"AVI video",
/* Quicktime */
@@ -42,6 +43,7 @@ resource 'STR#' (127)
/* OGG */
"Ogg stream",
"Ogg stream",
+ "Ogg video",
/* VLC */
"VLC plug-in",
/* Windows Media */
@@ -92,6 +94,7 @@ resource 'STR#' (128,"MIME Type")
"audio/mp4", "mp4,mpg4",
"application/mpeg4-iod", "mp4,mpg4",
"application/mpeg4-muxcodetable", "mp4,mpg4",
+ "video/x-m4v", "m4v",
/* AVI */
"video/x-msvideo", "avi",
/* Quicktime */
@@ -99,6 +102,7 @@ resource 'STR#' (128,"MIME Type")
/* OGG */
"application/ogg", "ogg",
"application/x-ogg", "ogg",
+ "video/ogg", "ogv",
/* VLC */
"application/x-vlc-plugin", "vlc",
/* Windows Media */
diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 2ec8e57..405ef61 100644
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -379,6 +379,7 @@ private:
"audio/x-m4a:m4a:MPEG-4 audio;" \
"application/mpeg4-iod:mp4,mpg4:MPEG-4 video;" \
"application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;" \
+ "video/x-m4v:m4v:MPEG-4 video;" \
/* AVI */ \
"video/x-msvideo:avi:AVI video;" \
/* QuickTime */ \
@@ -386,6 +387,7 @@ private:
/* OGG */ \
"application/x-ogg:ogg:Ogg stream;" \
"application/ogg:ogg:Ogg stream;" \
+ "video/ogg:ogv:Ogg video;" \
/* VLC */ \
"application/x-vlc-plugin:vlc:VLC plug-in;" \
/* Windows Media */ \
More information about the vlc-commits
mailing list