aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2003-10-02 14:29:24 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2003-10-02 14:29:24 +0000
commit7fe4c82382b641c9eae538afb5b17b47f2405072 (patch)
tree98e7408c77fce1af753d33f850b79355b65fed48
parent16c3c1ecb46a73c6648edba28353742086acce06 (diff)
downloadffmpeg-7fe4c82382b641c9eae538afb5b17b47f2405072.tar.gz
nut and vcr2
Originally committed as revision 2334 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/ffmpeg-doc.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b0248b02fa..5bfaa8f4c4 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -614,6 +614,7 @@ library:
@item Raw MPEG video @tab X @tab X
@item Raw PCM8/16 bits, mulaw/Alaw@tab X @tab X
@item SUN AU format @tab X @tab X
+@item NUT @tab X @tab X @tab NUT Open Container Format
@item Quicktime @tab X @tab X
@item MPEG4 @tab X @tab X
@tab MPEG4 is a variant of Quicktime
@@ -680,6 +681,7 @@ following image formats are supported:
@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
+@item ATI VCR2 @tab @tab X @tab fourcc: VCR2
@item Cirrus Logic AccuPak @tab @tab X @tab fourcc: CLJR
@item 4X Video @tab @tab X @tab used in certain computer games
@item Sony Playstation MDEC @tab @tab X