ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Fri May 8 15:39:23 2015 +0100| [da5c6a97bbfe34d4b30a89e72150dd400299ddce] | committer: Luca Barbato
riff: Add MultiScope II fourcc MSC2 as MJPEG Signed-off-by: Luca Barbato <lu_z...@gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da5c6a97bbfe34d4b30a89e72150dd400299ddce --- libavformat/riff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/riff.c b/libavformat/riff.c index 54c5eb2..6e77453 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -169,6 +169,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */ { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, + { AV_CODEC_ID_MJPEG, MKTAG('M', 'S', 'C', '2') }, /* Multiscope II */ { 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') }, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
