aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-13 05:56:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-14 19:25:15 +0100
commit52889b543dddf7e7b9a34cdfebfbccbccaf73160 (patch)
treed6e16988c56ca99b4929714178666f55bacd5d1e /libavformat
parent0d5c810bd59abed01f8e70ee956897599eaaea25 (diff)
downloadffmpeg-52889b543dddf7e7b9a34cdfebfbccbccaf73160.tar.gz
mpeg12dec: BW10 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 712488d337..0a2bddcca8 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -135,6 +135,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') },
{ CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, /* Matrox MPEG2 intra-only */
{ CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') },
+ { CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') },
{ CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */
{ CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },