From f10d3d343e3a01ab25a9641c00c6d5db17b226cc Mon Sep 17 00:00:00 2001 From: Francesco Lavra Date: Sun, 9 May 2010 23:19:19 +0000 Subject: [PATCH] Add FourCC MJPG for CODEC_ID_JPEGLS. Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 23076 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/riff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/riff.c b/libavformat/riff.c index 2b4c53f490..4355863c4b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -129,6 +129,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ + { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'P', 'G') }, { 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_MJPEG, MKTAG('I', 'J', 'P', 'G') },