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

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 4fb5a5eb3639c02d6a8068eccd26914e8f1753aa..eb424321a652c464f007549cf357e2672cda31df 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -577,6 +577,10 @@ static struct
     /* ATI VCR2 */
     { VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO,
       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 */
     { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,

diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 607d7ca552cf0f192ec91a7ff74a5f4a74818fb5..338fbc56c207ced191179acebe5757c86859d1d5 100644 (file)
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -115,7 +115,6 @@ static int OpenDecoder( vlc_object_t *p_this )
         p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','1') &&
         /* Pinnacle hardware-mpeg1 */
         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','g','2') &&
         p_dec->fmt_in.i_codec != VLC_FOURCC('h','d','v','2') )