]> git.sesse.net Git - vlc/commitdiff
Add FLV mimetypes in browser plugins
authorRafaël Carré <funman@videolan.org>
Wed, 19 Mar 2008 00:55:49 +0000 (01:55 +0100)
committerRafaël Carré <funman@videolan.org>
Wed, 19 Mar 2008 00:58:46 +0000 (01:58 +0100)
Patch contributed by dkl0

projects/mozilla/npvlc_rc.rc
projects/mozilla/vlc.r
projects/mozilla/vlcplugin.h

index e5e28c53276c179164016146b1ba0e319eea7187..c4695972facb5ccf7acb520800c509928ad6a136 100644 (file)
@@ -39,9 +39,9 @@ BEGIN
             VALUE "InternalName", "npvlc\0"
             VALUE "CompanyName", "VideoLAN Team\0"
             VALUE "LegalCopyright", "Copyright \251 1996-2006 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\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\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\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\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\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\0"
         END
     END
     BLOCK "VarFileInfo"
index ccbb6c650b1b49919167883cbbab3272a71f5ed8..d651c3829088da490695e21d9e9f3d445f772cf3 100644 (file)
@@ -62,6 +62,9 @@ resource 'STR#' (127)
         "3GPP2 video",
         /* DIVX */
         "DivX video",
+        /* FLV */
+        "FLV video",
+        "FLV video",
     };
 };
 
@@ -108,6 +111,10 @@ resource 'STR#' (128,"MIME Type")
         "video/3gpp2", "3g2,3gpp2",
         /* DIVX */
         "video/divx", "divx",
+        /* FLV */
+        "video/flv", "flv",
+        "video/x-flv", "flv",
+
     };
 };
 
index 645dfe82875cd9c67fbf52c47ead59a230cf4848..d3c9af356bc4b44a6aae090882982cf2c8b1fbf6 100644 (file)
@@ -204,6 +204,11 @@ private:
     "audio/3gpp2:3g2,3gpp2:3GPP2 audio;" \
     "video/3gpp2:3g2,3gpp2:3GPP2 video;" \
     /* DIVX */ \
-    "video/divx:divx:DivX video;"
+    "video/divx:divx:DivX video;" \
+    /* FLV */ \
+    "video/flv:flv:FLV video;" \
+    "video/x-flv:flv:FLV video;"
+
+
 
 #endif