summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2003-10-12 21:16:31 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2003-10-12 21:16:31 +0000
commitd6896c49ccd3f02500d0397b63b4dda5d9e24ea9 (patch)
tree660bd5171a9106a468e2875320b40e761f79a0a3 /doc
parentbba3a09bb085e09ab894483c94eea3d97fe959a2 (diff)
add some missing codecs
Originally committed as revision 2365 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index c5ace0be0b..4c60035d8d 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -671,8 +671,12 @@ following image formats are supported:
@item WMV8 @tab X @tab X @tab Not completely working
@item H263(+) @tab X @tab X @tab Also known as Real Video 1.0
@item MJPEG @tab X @tab X
+@item Lossless MJPEG @tab X @tab X
+@item Apple MJPEG-B @tab @tab X
+@item Sunplus MJPEG @tab @tab X @tab fourcc: SP5X
@item DV @tab X @tab X
@item Huff YUV @tab X @tab X
+@item FFmpeg Video 1 @tab X @tab X @tab Lossless codec (fourcc: FFV1)
@item Asus v1 @tab X @tab X @tab fourcc: ASV1
@item Asus v2 @tab X @tab X @tab fourcc: ASV2
@item Creative YUV @tab @tab X @tab fourcc: CYUV
@@ -680,6 +684,7 @@ following image formats are supported:
@item Sorenson Video 1 @tab @tab X @tab fourcc: SVQ1
@item Sorenson Video 3 @tab @tab X @tab fourcc: SVQ3
@item On2 VP3 @tab @tab X @tab still experimental
+@item Theora @tab @tab X @tab still experimental
@item Intel Indeo 3 @tab @tab X @tab only works on i386 right now
@item FLV @tab X @tab X @tab Flash H263 variant
@item ATI VCR1 @tab @tab X @tab fourcc: VCR1
@@ -741,6 +746,8 @@ solutions.
@tab used in various Interplay computer games
@item Xan DPCM @tab @tab X
@tab used in Origin's Wing Commander IV AVI files
+@item Apple MACE 3 @tab @tab X
+@item Apple MACE 6 @tab @tab X
@end multitable
@code{X} means that the encoding (resp. decoding) is supported.