summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-05-05 23:51:20 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-05-05 23:52:38 +0200
commite31cdb5cc8080e164c66838a69f37f60f2d0ea82 (patch)
treeffc3fef238e5cdd2b33f326bec1f0cb50e9ae00d /libavformat/riff.c
parent1ace789fb344fcc571503f2246f542eeb62bd865 (diff)
lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.
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 b506b94425..389231a369 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -174,6 +174,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
{ AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') },
+ { AV_CODEC_ID_MJPEG, MKTAG('M', 'S', 'C', '2') }, /* Multiscope II */
{ AV_CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
/* Pegasus lossless JPEG */
{ AV_CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') },