projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
643bae3
)
add another mjpeg fourcc to riff.c list
author
Ben Littler
<tempn@twmi.rr.com>
Tue, 5 Jan 2010 20:14:50 +0000
(20:14 +0000)
committer
Ben Littler
<tempn@twmi.rr.com>
Tue, 5 Jan 2010 20:14:50 +0000
(20:14 +0000)
Originally committed as revision 21032 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
ca8d7da
..
fcc9137
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-139,6
+139,7
@@
const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') },
{ CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') },
{ CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') },
+ { CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */
{ CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
{ CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
{ CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },