add MMES fourcc, matrox mpeg2 in avi files

Originally committed as revision 9234 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 1760fd37fca87b2f736a6cd862b2f030eb70a8a0..af3e7145c5e08f21783909672b7a51a30aea75ef 100644 (file)
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -97,6 +97,7 @@ const AVCodecTag codec_bmp_tags[] = {
     { CODEC_ID_MPEG1VIDEO, 0x10000001 },
     { CODEC_ID_MPEG2VIDEO, 0x10000002 },
     { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
+    { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
     { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
     { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
     { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },