Changed audio/video MIME subtype from mpeg4 to mp4

This is in accordance with RFC 4337 (currently a Proposed Standard,
see http://tools.ietf.org/html/rfc4337), and makes Firefox3 actually
play my .mp4's.

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

diff --git a/projects/mozilla/npvlc_rc.rc.in b/projects/mozilla/npvlc_rc.rc.in
index 995bc29d1f741b8934aa21bc6af3e6c2d94dd90a..26e310d687f39f520985ed98c118f7ec3f820b06 100644 (file)
--- a/projects/mozilla/npvlc_rc.rc.in
+++ b/projects/mozilla/npvlc_rc.rc.in
@@ -31,7 +31,7 @@ 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/mpeg4|audio/mpeg4|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\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\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\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\0"
         END

diff --git a/projects/mozilla/vlc.r b/projects/mozilla/vlc.r
index 3098b5d880a0f4c05b57c61c4e6254b3f73c9f8a..69b62da9a5d9c15c2a5af33ebcb282e0ffada8e8 100644 (file)
--- a/projects/mozilla/vlc.r
+++ b/projects/mozilla/vlc.r
@@ -80,8 +80,8 @@ resource 'STR#' (128,"MIME Type")
         "video/mpeg-system", "mpg,mpeg,vob",
         "video/x-mpeg-system", "mpg,mpeg,vob",
         /* MPEG-4 */
-        "video/mpeg4", "mp4,mpg4",
-        "audio/mpeg4", "mp4,mpg4",
+        "video/mp4", "mp4,mpg4",
+        "audio/mp4", "mp4,mpg4",
         "application/mpeg4-iod", "mp4,mpg4",
         "application/mpeg4-muxcodetable", "mp4,mpg4",
         /* AVI */

diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index cb6132a6558672fcd6e21ee3f3a1542284734d42..4a1e3d9dc68e87d380a47fc54713177d4127227a 100644 (file)
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -189,8 +189,8 @@ private:
     "video/mpeg-system:mpg,mpeg,mpe,vob:MPEG video;" \
     "video/x-mpeg-system:mpg,mpeg,mpe,vob:MPEG video;" \
     /* MPEG-4 */ \
-    "video/mpeg4:mp4,mpg4:MPEG-4 video;" \
-    "audio/mpeg4:mp4,mpg4:MPEG-4 audio;" \
+    "video/mp4:mp4,mpg4:MPEG-4 video;" \
+    "audio/mp4:mp4,mpg4:MPEG-4 audio;" \
     "application/mpeg4-iod:mp4,mpg4:MPEG-4 video;" \
     "application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;" \
     /* AVI */ \