Mercurial > libavformat.hg

changeset 978:c168be36dbba libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by kostya shishkov - gmail - com.
author banan
date Wed, 01 Mar 2006 07:42:55 +0000
parents 8bb9cea3c2d3
children d2e5dfdf4def
files avienc.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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') },