summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2005-10-13 04:37:06 +0000
committerMike Melanson <mike@multimedia.cx>2005-10-13 04:37:06 +0000
commitdce76c20cf3c88e5f340ff529f943d264cd072c6 (patch)
treec88780a4375e3913b3bb01481d5a519fa868df74
parent515ae4760a9c37811c2ef1b4dbc0e23756d9d1b8 (diff)
downloadffmpeg-streaming-dce76c20cf3c88e5f340ff529f943d264cd072c6.zip
ffmpeg-streaming-dce76c20cf3c88e5f340ff529f943d264cd072c6.tar.gz
documentation update
Originally committed as revision 4640 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--CREDITS1
-rw-r--r--Changelog2
-rw-r--r--doc/ffmpeg-doc.texi1
3 files changed, 4 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index de37419..95a7dd7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -18,6 +18,7 @@ Roine Gustafsson
David Hammerton
Wolfgang Hesseler
Falk Hueffner
+Steven Johnson
Zdenek Kabelac
Robin Kay
Todd Kirby
diff --git a/Changelog b/Changelog
index f3e9a63..fb0efa2 100644
--- a/Changelog
+++ b/Changelog
@@ -20,6 +20,8 @@ version <next>
- Sonic audio encoder/decoder
- Vorbis decoder
- Macromedia ADPCM decoder
+- Duck TrueMotion 2 decoder
+- Support for decoding FLX and DTA extensions in FLIC files
version 0.4.9-pre1:
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 3dd423c..0b2560a 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -771,6 +771,7 @@ following image formats are supported:
@item Planar RGB @tab @tab X @tab fourcc: 8BPS
@item FLIC video @tab @tab X
@item Duck TrueMotion v1 @tab @tab X @tab fourcc: DUCK
+@item Duck TrueMotion v2 @tab @tab X @tab fourcc: TM20
@item VMD Video @tab @tab X @tab Used in Sierra VMD files.
@item MSZH @tab @tab X @tab Part of LCL
@item ZLIB @tab X @tab X @tab Part of LCL, encoder experimental
OpenPOWER on IntegriCloud