Support FourCC mjpa as MJPEG.

Fixes issue 1492. Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk

Support FourCC mjpa as MJPEG.
Fixes issue 1492. Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk
94ec3aca · Carl Eugen Hoyos · 9dd08b4e · 94ec3aca
Commit 94ec3aca authored Oct 18, 2009 by Carl Eugen Hoyos
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

riff.c libavformat/riff.c +1 -0

No files found.
--- 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 */