Commit c7b6410c authored by cehoyos's avatar cehoyos

Add FourCC MJPG for CODEC_ID_JPEGLS.

Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23076 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e5c78747
......@@ -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') },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment