From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Sun, 18 Oct 2009 22:43:19 +0000 (+0000)
Subject: Support FourCC mjpa as MJPEG.
X-Git-Tag: android-x86-4.4-r1~24940
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=94ec3aca56d074d0ee7ea08f270a1ad405442056;p=android-x86%2Fexternal-ffmpeg.git

Support FourCC mjpa as MJPEG.
Fixes issue 1492.

Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

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 */