diff options
| author | Francesco Lavra <francescolavra@interfree.it> | 2010-05-09 23:19:19 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-05-09 23:19:19 +0000 |
| commit | f10d3d343e3a01ab25a9641c00c6d5db17b226cc (patch) | |
| tree | 9f27662cc5aef9bc82944e453697c803d2a11565 /libavformat | |
| parent | 658e7576fced59bfa6a45254c1c84e649a4f125f (diff) | |
Add FourCC MJPG for CODEC_ID_JPEGLS.
Patch by Francesco Lavra, francescolavra interfree it
Originally committed as revision 23076 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 2b4c53f490..4355863c4b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -129,6 +129,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { 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 */ + { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, |