[FFmpeg-cvslog] lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.

Carl Eugen Hoyos git at videolan.org
Tue May 5 23:52:59 CEST 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue May  5 23:51:20 2015 +0200| [e31cdb5cc8080e164c66838a69f37f60f2d0ea82] | committer: Carl Eugen Hoyos

lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e31cdb5cc8080e164c66838a69f37f60f2d0ea82
---

 libavformat/riff.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/riff.c b/libavformat/riff.c
index b506b94..389231a 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') },



More information about the ffmpeg-cvslog mailing list