From: Michael Niedermayer Date: Sat, 10 Mar 2007 11:30:48 +0000 (+0000) Subject: jpeg fourcc X-Git-Tag: v0.5~9737 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=140fba098536aa43d09afaf48d7087df0cb7c347;ds=sidebyside jpeg fourcc Originally committed as revision 8310 to svn://svn.ffmpeg.org/ffmpeg/trunk --- 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') },