diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-10-18 22:43:19 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-10-18 22:43:19 +0000 |
| commit | 94ec3aca56d074d0ee7ea08f270a1ad405442056 (patch) | |
| tree | 1ab288158158e39d8cae793ef126922649fa8270 /libavformat/riff.c | |
| parent | 9dd08b4e1ebc294848e69dd3e1d4eed19ffe5a90 (diff) | |
| download | ffmpeg-94ec3aca56d074d0ee7ea08f270a1ad405442056.tar.gz | |
Support FourCC mjpa as MJPEG.
Fixes issue 1492.
Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |