[Ffmpeg-devel] [PATCH] JPEG-LS Updates

[Kostya]

Here are two patches, first one sets 'MJLS' FOURCC for JPEG-LS in AVI, second one corrects documentation.
-------------- next part --------------
diff -ru --exclude CVS --exclude '*.o' /home/kst/cvs-get/ffmpeg/libavformat/avienc.c ffmpeg/libavformat/avienc.c
--- /home/kst/cvs-get/ffmpeg/libavformat/avienc.c	2006-02-25 08:01:17.000000000 +0200
+++ ffmpeg/libavformat/avienc.c	2006-02-28 20:10:10.000000000 +0200
@@ -149,6 +147,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') },
-------------- next part --------------
diff -ru --exclude CVS --exclude '*.o' /home/kst/cvs-get/ffmpeg/Changelog ffmpeg/Changelog
--- /home/kst/cvs-get/ffmpeg/Changelog	2006-02-17 06:45:45.000000000 +0200
+++ ffmpeg/Changelog	2006-02-18 15:15:21.000000000 +0200
@@ -29,7 +29,7 @@
 - TrueSpeech audio decoder
 - WMA2 audio decoder fixed, now all files should play correctly
 - RealAudio 14.4 and 28.8 decoders fixed
-- JPEG-LS decoder
+- JPEG-LS encoder and decoder
 - CamStudio video decoder
 - build system improvements
 - tabs and trailing whitespace removed from the codebase
diff -ru --exclude CVS --exclude '*.o' /home/kst/cvs-get/ffmpeg/doc/ffmpeg-doc.texi ffmpeg/doc/ffmpeg-doc.texi
--- /home/kst/cvs-get/ffmpeg/doc/ffmpeg-doc.texi	2006-02-25 08:00:31.000000000 +0200
+++ ffmpeg/doc/ffmpeg-doc.texi	2006-02-18 15:17:28.000000000 +0200
@@ -744,6 +742,7 @@
 @item RealVideo 2.0          @tab  X  @tab  X
 @item MJPEG                  @tab  X  @tab  X
 @item lossless MJPEG         @tab  X  @tab  X
+ at item JPEG-LS                @tab  X  @tab  X @tab fourcc: MJLS, lossless and near-lossless is supported
 @item Apple MJPEG-B          @tab     @tab  X
 @item Sunplus MJPEG          @tab     @tab  X @tab fourcc: SP5X
 @item DV                     @tab  X  @tab  X