diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2006-03-01 07:42:55 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2006-03-01 07:42:55 +0000 |
| commit | 26d6d032702c55616127511fa317b96763eb5cb3 (patch) | |
| tree | 23a08c95e21f7467cf618d3530f9d7c42c25ae66 /libavformat/avienc.c | |
| parent | 94d1d6c02db079c27c6a91a5a2772e6277380865 (diff) | |
| download | ffmpeg-26d6d032702c55616127511fa317b96763eb5cb3.tar.gz | |
Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by
kostya shishkov - gmail - com.
Originally committed as revision 5082 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 4d97ad79b8..0a6adb1b6c 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -149,6 +149,8 @@ const CodecTag 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_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ + { 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') }, |