mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-25 04:30:02 +00:00
move jpegls up, fixes sf bug #1629152
Originally committed as revision 9165 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
47b777ceed
commit
fc1f90d4e9
@ -101,11 +101,11 @@ const AVCodecTag codec_bmp_tags[] = {
|
||||
{ CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
|
||||
{ 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_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') },
|
||||
{ CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
|
||||
{ CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
|
||||
{ CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
|
||||
{ CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
|
||||
{ CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
|
||||
|
Loading…
Reference in New Issue
Block a user