diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-05-08 15:39:23 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-05-12 03:22:18 +0200 |
| commit | da5c6a97bbfe34d4b30a89e72150dd400299ddce (patch) | |
| tree | 8eb80d7d6dc740e81fa0587678415de3481d6d55 /libavformat/riff.c | |
| parent | 0670acc4f1c4ceb16968818a654e07a3f550a8c9 (diff) | |
| download | ffmpeg-da5c6a97bbfe34d4b30a89e72150dd400299ddce.tar.gz | |
riff: Add MultiScope II fourcc MSC2 as MJPEG
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 54c5eb2a00..6e77453b86 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') }, |