diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-25 00:43:13 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-25 00:44:48 +0200 |
| commit | 03546a9ac8753b3f083ae3d2a6397c8c0011923b (patch) | |
| tree | d6b5b98ab45564bc671cc68ac80cbec6e4fbb5a8 /libavformat | |
| parent | 69cf1824c6001ccc37d9ece5308c9a8f8d1dec26 (diff) | |
| download | ffmpeg-03546a9ac8753b3f083ae3d2a6397c8c0011923b.tar.gz | |
Support fourcc MMJP.
Fixes ticket #107.
Diffstat (limited to 'libavformat')
| -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 3950a06c26..48a8df4e18 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -151,6 +151,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { 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_MJPEG, MKTAG('M', 'M', 'J', 'P') }, { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, |