OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
64472fc
)
jpeg fourcc
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 10 Mar 2007 11:30:48 +0000
(11:30 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 10 Mar 2007 11:30:48 +0000
(11:30 +0000)
Originally committed as revision 8310 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
89cfb51
..
a7ecec7
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-102,6
+102,7
@@
const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
{ CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
{ CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
+ { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },
{ CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
{ CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
{ CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },