summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-03-10 11:30:48 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-03-10 11:30:48 +0000
commit140fba098536aa43d09afaf48d7087df0cb7c347 (patch)
tree04a740b9a9b417098f91e55cfdabf240adb1ca5a /libavformat/riff.c
parent64472fcff1cae404a4cd6375ad0c86b7e6e4dbcc (diff)
downloadffmpeg-140fba098536aa43d09afaf48d7087df0cb7c347.tar.gz
jpeg fourcc
Originally committed as revision 8310 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 89cfb512ec..a7ecec7596 100644
--- 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') },