npapi-vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Aug 2 22:55:18 2011 +0200| [3745b87331ad1de7d97387f5448bdc29b228178e] | committer: Jean-Baptiste Kempf
Support application/x-matroska for MKV > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=3745b87331ad1de7d97387f5448bdc29b228178e --- npapi/npvlc_rc.rc.in | 6 +++--- npapi/vlc.r.in | 6 ++++-- npapi/vlcshell.h | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/npapi/npvlc_rc.rc.in b/npapi/npvlc_rc.rc.in index 5afb435..e7c9e9e 100644 --- a/npapi/npvlc_rc.rc.in +++ b/npapi/npvlc_rc.rc.in @@ -32,9 +32,9 @@ BEGIN VALUE "FileDescription", "VLC media player Web Plugin @VERSION@\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 "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 "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 "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 "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|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 video|Matroska audio|Playlist xspf|MPEG audio|WebM video|WebM audio|Real Media File|Real Media Audio|AMR audio|FLAC audio\0" END END BLOCK "VarFileInfo" diff --git a/npapi/vlc.r.in b/npapi/vlc.r.in index 7767373..695e042 100644 --- a/npapi/vlc.r.in +++ b/npapi/vlc.r.in @@ -72,8 +72,9 @@ resource 'STR#' (127) "FLV video", "FLV video", /* MkV */ - "MKV video", - "MKV audio", + "Matroska video", + "Matroska video", + "Matroska audio", /* XSPF */ "XSPF playlist", /* M3U */ @@ -144,6 +145,7 @@ resource 'STR#' (128,"MIME Type") "video/flv", "flv", "video/x-flv", "flv", /* MKV */ + "application/x-matroska", "mkv", "video/x-matroska", "mkv", "audio/x-matroska", "mka", /* XSPF */ diff --git a/npapi/vlcshell.h b/npapi/vlcshell.h index 4e2d1ed..84eb28e 100644 --- a/npapi/vlcshell.h +++ b/npapi/vlcshell.h @@ -129,6 +129,7 @@ static char mimetype[] = "video/flv:flv:FLV video;" "video/x-flv:flv:FLV video;" /* Matroska */ + "application/x-matroska:mkv:Matroska video;" "video/x-matroska:mkv:Matroska video;" "audio/x-matroska:mka:Matroska audio;" /* XSPF */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
