projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ace789
)
lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Tue, 5 May 2015 21:51:20 +0000
(23:51 +0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Tue, 5 May 2015 21:52:38 +0000
(23:52 +0200)
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index b506b944250747d4c040c1e9809c8c68bbab0ed2..389231a369950afef64f603f56a0adc8131c8017 100644
(file)
--- 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') },