documentation update

Originally committed as revision 4640 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/CREDITS b/CREDITS
index de374196928009098ee20c531c07d2864c43bf3a..95a7dd743ead3716d6e353661330acc33f24523e 100644 (file)
--- 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 f3e9a6344c82199c404dfd69679dc3ab96a8abac..fb0efa24f7505037ac95d45f49b23b3880aa20b6 100644 (file)
--- 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 3dd423c13f24365d652e53c226209963f980b93e..0b2560af524543126d9ec617c8bd2cd797b15057 100644 (file)
--- 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