aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Härdin <tomas.hardin@codemill.se>2010-06-07 11:27:26 +0000
committerReinhard Tartler <siretart@tauware.de>2011-11-05 13:18:31 +0100
commit2fc39af1dec9cae61df35dd9dcc5200021aa5f30 (patch)
tree5134807f9637bb67bcb19ce19b21d22efdb7c038
parent973d752dfbfb3286c6494f99744f386b98fda4d7 (diff)
downloadffmpeg-2fc39af1dec9cae61df35dd9dcc5200021aa5f30.tar.gz
Added M701 codec_tag for mpeg2video
Originally committed as revision 23513 to svn://svn.ffmpeg.org/ffmpeg/trunk (cherry picked from commit 77d3f1f792c2a0bd455c75b0aa8e356b3a470ea7) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 64464caa5d..0e925f25cc 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -123,6 +123,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
{ CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') },
{ CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') },
+ { CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, /* Matrox MPEG2 intra-only */
{ CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
{ CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },