Skip to content

V
vlc
Commit 711de3fb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Add support for fourCC MMES, which is a Matrox MPEG-2 codec... Remove a wrong comment.

parent 4530a2d7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
modules/codec/ffmpeg/ffmpeg.c
View file @ 711de3fb
...@@ -577,6 +577,10 @@ static struct ...@@ -577,6 +577,10 @@ static struct
/* ATI VCR2 */ /* ATI VCR2 */
{ VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO, { VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "ATI VCR2 Video" }, VIDEO_ES, "ATI VCR2 Video" },
{ VLC_FOURCC('M','M','E','S'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "Matrox MPEG-2" },
{ VLC_FOURCC('m','m','e','s'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "Matrox MPEG-2" },
/* MPEG-4 Video */ /* MPEG-4 Video */
{ VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4, { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
......
modules/codec/libmpeg2.c
View file @ 711de3fb
...@@ -115,7 +115,6 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -115,7 +115,6 @@ static int OpenDecoder( vlc_object_t *p_this )
p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','1') && p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','1') &&
/* Pinnacle hardware-mpeg1 */ /* Pinnacle hardware-mpeg1 */
p_dec->fmt_in.i_codec != VLC_FOURCC('P','I','M','1') && p_dec->fmt_in.i_codec != VLC_FOURCC('P','I','M','1') &&
/* ATI Video */
p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','2','v') && p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','2','v') &&
p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','2') && p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','2') &&
p_dec->fmt_in.i_codec != VLC_FOURCC('h','d','v','2') ) p_dec->fmt_in.i_codec != VLC_FOURCC('h','d','v','2') )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment