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:
15cdff8
)
fourcc CJPG is sequential jpeg
author
Ben Littler
<tempn@twmi.rr.com>
Thu, 8 Jan 2009 17:51:03 +0000
(17:51 +0000)
committer
Ben Littler
<tempn@twmi.rr.com>
Thu, 8 Jan 2009 17:51:03 +0000
(17:51 +0000)
Originally committed as revision 16496 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
e9214d3
..
dd08dfc
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-117,6
+117,7
@@
const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
{ CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
{ CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
+ { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') },
{ CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
{ CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
{ CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },