diff options
| author | Ben Littler <tempn@twmi.rr.com> | 2010-01-05 20:14:50 +0000 |
|---|---|---|
| committer | Ben Littler <tempn@twmi.rr.com> | 2010-01-05 20:14:50 +0000 |
| commit | 418a287cae2d3b1ff96ead02564e86c8cd0b91ee (patch) | |
| tree | 0d42ce9078a87c08ce69039c8af8e3d6fb1e2702 /libavformat/riff.c | |
| parent | 643bae382c2610512652d3c5cfa7aabb450a706e (diff) | |
| download | ffmpeg-418a287cae2d3b1ff96ead02564e86c8cd0b91ee.tar.gz | |
add another mjpeg fourcc to riff.c list
Originally committed as revision 21032 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 ca8d7da6bd..fcc9137927 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -139,6 +139,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, + { CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */ { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, |