# HG changeset patch # User banan # Date 1141198975 0 # Node ID c168be36dbba60c0c86468c006e7b475e5f0f078 # Parent 8bb9cea3c2d3ce1e6862eea55791fa94aaa9f31b Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by kostya shishkov - gmail - com. diff -r 8bb9cea3c2d3 -r c168be36dbba avienc.c --- a/avienc.c Wed Mar 01 01:32:32 2006 +0000 +++ b/avienc.c Wed Mar 01 07:42:55 2006 +0000 @@ -149,6 +149,8 @@ { 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') },