vlc/vlc-1.1 | branch: master | Martin Storsjö <[email protected]> | Sun Apr 10 20:56:18 2011 +0300| [ad8ef3e1abccb60406894640c0fb041ec631cb4c] | committer: Jean-Baptiste Kempf
mozilla: Add amr as a supported file type in the plugin Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=ad8ef3e1abccb60406894640c0fb041ec631cb4c --- projects/mozilla/npvlc_rc.rc.in | 6 +++--- projects/mozilla/vlc.r.in | 4 ++++ projects/mozilla/vlcplugin.h | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/projects/mozilla/npvlc_rc.rc.in b/projects/mozilla/npvlc_rc.rc.in index 975e359..cb536e7 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\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\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\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" END END BLOCK "VarFileInfo" diff --git a/projects/mozilla/vlc.r.in b/projects/mozilla/vlc.r.in index 623dbf6..8da6d5a 100644 --- a/projects/mozilla/vlc.r.in +++ b/projects/mozilla/vlc.r.in @@ -71,6 +71,8 @@ resource 'STR#' (127) /* WebM */ "WebM video", "WebM audio", + /* AMR */ + "AMR audio", }; }; @@ -128,6 +130,8 @@ resource 'STR#' (128,"MIME Type") /* WebM */ "video/webm", "webm", "audio/webm", "webm", + /* AMR */ + "audio/amr", "amr", }; }; diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h index 0d26099..2ec8e57 100644 --- a/projects/mozilla/vlcplugin.h +++ b/projects/mozilla/vlcplugin.h @@ -418,6 +418,8 @@ private: "application/xspf+xml:xspf:Playlist xspf;" \ /* Webm */ \ "video/webm:webm:WebM video;" \ - "audio/webm:webm:WebM audio;" + "audio/webm:webm:WebM audio;" \ + /* AMR */ \ + "audio/amr:amr:AMR audio;" #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
