[SCM] libav/experimental: Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by kostya shishkov - gmail - com.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:46:46 UTC 2013
The following commit has been merged in the experimental branch:
commit 26d6d032702c55616127511fa317b96763eb5cb3
Author: Benjamin Larsson <banan at ludd.ltu.se>
Date: Wed Mar 1 07:42:55 2006 +0000
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
diff --git a/Changelog b/Changelog
index 962d259..e5a5fd9 100644
--- a/Changelog
+++ b/Changelog
@@ -29,7 +29,7 @@ version <next>
- 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 --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 840423d..c50e919 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -744,6 +744,7 @@ following image formats are supported:
@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
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 4d97ad7..0a6adb1 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') },
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list