summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2006-03-01 07:42:55 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2006-03-01 07:42:55 +0000
commit26d6d032702c55616127511fa317b96763eb5cb3 (patch)
tree23a08c95e21f7467cf618d3530f9d7c42c25ae66 /doc
parent94d1d6c02db079c27c6a91a5a2772e6277380865 (diff)
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
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 840423d82c..c50e9199dd 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
+@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