From 94ec3aca56d074d0ee7ea08f270a1ad405442056 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 18 Oct 2009 22:43:19 +0000 Subject: [PATCH] Support FourCC mjpa as MJPEG. Fixes issue 1492. Originally committed as revision 20296 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 b6feb13353..74d3908b69 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -119,6 +119,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, + { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, { 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 */