Commit 3745b873 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Support application/x-matroska for MKV

parent ff51d50f
...@@ -32,9 +32,9 @@ BEGIN ...@@ -32,9 +32,9 @@ BEGIN
VALUE "FileDescription", "VLC media player Web Plugin @VERSION@\0" VALUE "FileDescription", "VLC media player Web Plugin @VERSION@\0"
VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors\0" VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors\0"
VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN\0" VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN\0"
VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|audio/mp4|audio/x-m4a|video/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-m4v|video/x-msvideo|application/ogg|video/ogg|application/x-ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|video/x-ms-wvx|audio/x-ms-wma|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-mpegurl|video/webm|audio/webm|application/vnd.rn-realmedia|audio/x-realaudio|audio/amr|audio/x-flac\0" VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|audio/mp4|audio/x-m4a|video/mp4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-m4v|video/x-msvideo|application/ogg|video/ogg|application/x-ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|video/x-ms-wvx|audio/x-ms-wma|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|application/x-matroska|video/x-matroska|audio/x-matroska|application/xspf+xml|audio/x-mpegurl|video/webm|audio/webm|application/vnd.rn-realmedia|audio/x-realaudio|audio/amr|audio/x-flac\0"
VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,mpe,vob|mpg,mpeg,mpe,vob|aac,mp4,mpg4|m4a|mp4,mpg4|mp4,mpg4|mp4,mpg4|m4v|avi|ogg|ogv|ogg||asf,asx|asf,asx||wmv|wvx|wma||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mka|xspf|m3u|webm|webm|rm|ra|amr|flac\0" VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,mpe,vob|mpg,mpeg,mpe,vob|aac,mp4,mpg4|m4a|mp4,mpg4|mp4,mpg4|mp4,mpg4|m4v|avi|ogg|ogv|ogg||asf,asx|asf,asx||wmv|wvx|wma||wav|wav|3gp,3gpp|3gp,3gpp|3g2,3gpp2|3g2,3gpp2|divx|flv|flv|mkv|mkv|mka|xspf|m3u|webm|webm|rm|ra|amr|flac\0"
VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 audio|MPEG-4 audio|MPEG-4 video|MPEG-4 video|MPEG-4 video|MPEG-4 video|AVI video|Ogg stream|Ogg video|Ogg stream|VLC plug-in|Windows Media Video|Windows Media Video|Windows Media|Windows Media|Windows Media Video|Windows Media Audio|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 audio|WebM video|WebM audio|Real Media File|Real Media Audio|AMR audio|FLAC audio\0" VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 audio|MPEG-4 audio|MPEG-4 video|MPEG-4 video|MPEG-4 video|MPEG-4 video|AVI video|Ogg stream|Ogg video|Ogg stream|VLC plug-in|Windows Media Video|Windows Media Video|Windows Media|Windows Media|Windows Media Video|Windows Media Audio|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 video|Matroska audio|Playlist xspf|MPEG audio|WebM video|WebM audio|Real Media File|Real Media Audio|AMR audio|FLAC audio\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
...@@ -72,8 +72,9 @@ resource 'STR#' (127) ...@@ -72,8 +72,9 @@ resource 'STR#' (127)
"FLV video", "FLV video",
"FLV video", "FLV video",
/* MkV */ /* MkV */
"MKV video", "Matroska video",
"MKV audio", "Matroska video",
"Matroska audio",
/* XSPF */ /* XSPF */
"XSPF playlist", "XSPF playlist",
/* M3U */ /* M3U */
...@@ -144,6 +145,7 @@ resource 'STR#' (128,"MIME Type") ...@@ -144,6 +145,7 @@ resource 'STR#' (128,"MIME Type")
"video/flv", "flv", "video/flv", "flv",
"video/x-flv", "flv", "video/x-flv", "flv",
/* MKV */ /* MKV */
"application/x-matroska", "mkv",
"video/x-matroska", "mkv", "video/x-matroska", "mkv",
"audio/x-matroska", "mka", "audio/x-matroska", "mka",
/* XSPF */ /* XSPF */
......
...@@ -129,6 +129,7 @@ static char mimetype[] = ...@@ -129,6 +129,7 @@ static char mimetype[] =
"video/flv:flv:FLV video;" "video/flv:flv:FLV video;"
"video/x-flv:flv:FLV video;" "video/x-flv:flv:FLV video;"
/* Matroska */ /* Matroska */
"application/x-matroska:mkv:Matroska video;"
"video/x-matroska:mkv:Matroska video;" "video/x-matroska:mkv:Matroska video;"
"audio/x-matroska:mka:Matroska audio;" "audio/x-matroska:mka:Matroska audio;"
/* XSPF */ /* XSPF */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment