From 26d6d032702c55616127511fa317b96763eb5cb3 Mon Sep 17 00:00:00 2001 From: Benjamin Larsson Date: Wed, 1 Mar 2006 07:42:55 +0000 Subject: 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 --- libavformat/avienc.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavformat/avienc.c') 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') }, -- cgit v1.2.3