diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2003-06-20 18:21:58 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2003-06-20 18:21:58 +0000 |
| commit | ccafe7b122bc86d1ed8c499deef851fdd35ea043 (patch) | |
| tree | 033fbebebaac389a2952adeea35324276e175d59 /libavformat/avienc.c | |
| parent | 611d192ce01181928c84e8f157ffffb3baaa48a1 (diff) | |
| download | ffmpeg-ccafe7b122bc86d1ed8c499deef851fdd35ea043.tar.gz | |
lossless jpeg support
Originally committed as revision 1981 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index a803e761e3..cf9042ed5a 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -83,7 +83,6 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_H263P, MKTAG('h', '2', '6', '3') }, { CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') }, - { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X'), .invalid_asf = 1 }, { CODEC_ID_MPEG4, MKTAG('d', 'i', 'v', 'x'), .invalid_asf = 1 }, { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0'), .invalid_asf = 1 }, @@ -152,6 +151,9 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, + { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'g') }, + { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, + { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { CODEC_ID_HUFFYUV, MKTAG('h', 'f', 'y', 'u') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, |