Navigation

← Previous Changeset
Next Changeset →

Changeset cf3100336b61b3297f368c68c5e019b157dba63b

Timestamp:

03/19/08 01:58:46 (4 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1205888326 +0100

git-parent:

[9e96ce01733f21e24b8b357dfd9096c92480edf9]

git-author:

Rafaël Carré <funman@videolan.org> 1205888149 +0100

Message:

Add FLV mimetypes in browser plugins

Patch contributed by dkl0

Files:

projects/mozilla/npvlc_rc.rc (modified) (1 diff)
projects/mozilla/vlc.r (modified) (2 diffs)
projects/mozilla/vlcplugin.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

projects/mozilla/npvlc_rc.rc

r1e9ff27	rcf31003
40	40	VALUE "CompanyName", "VideoLAN Team\0"
41	41	VALUE "LegalCopyright", "Copyright \251 1996-2006 The VideoLAN Team\0"
42		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"
43		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"
44		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"
	42	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"
	43	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"
	44	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"
45	45	END
46	46	END

projects/mozilla/vlc.r

r1e9ff27	rcf31003
63	63	/* DIVX */
64	64	"DivX video",
	65	/* FLV */
	66	"FLV video",
	67	"FLV video",
65	68	};
66	69	};
…	…
109	112	/* DIVX */
110	113	"video/divx", "divx",
	114	/* FLV */
	115	"video/flv", "flv",
	116	"video/x-flv", "flv",
	117
111	118	};
112	119	};

projects/mozilla/vlcplugin.h

r35979e8	rcf31003
205	205	"video/3gpp2:3g2,3gpp2:3GPP2 video;" \
206	206	/* DIVX */ \
207		"video/divx:divx:DivX video;"
208
209		#endif
	207	"video/divx:divx:DivX video;" \
	208	/* FLV */ \
	209	"video/flv:flv:FLV video;" \
	210	"video/x-flv:flv:FLV video;"
	211
	212
	213
	214	#endif