summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-06-06 15:52:53 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-06-06 15:52:53 +0000
commite5f0be5a0c86c7c6071e34e8da4898f3957c43f7 (patch)
treee0cd1003c2744b7dc63fadeedbc34d71b3832354 /libavformat/riff.c
parent769168632764a2011f6ed24786e3fa34a214190b (diff)
add MMES fourcc, matrox mpeg2 in avi files
Originally committed as revision 9234 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 1760fd37fc..af3e7145c5 100644
--- 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') },