fringe feature update

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

3 files changed, 22 insertions, 1 deletions

diff --git a/CREDITS b/CREDITS
index 8befb29c9f..ea22f981e9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,6 +2,7 @@ This file contains the name of the people who have contributed to
 ffmpeg. The names are sorted alphabetically.
 
 Fabrice Bellard
+Mario Brito
 Alex Beregszaszi
 Tim Ferguson
 Brian Foley
diff --git a/Changelog b/Changelog
index cf81e919d9..825f4fd3c3 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
-Upcoming version 0.4.7:
+Upcoming version 0.4.8:
+- Id RoQ playback subsystem (Mike Melanson and Time Ferguson)
+- Wing Commander III Movie (.mve) file playback subsystem (Mike Melanson
+  and Mario Brito)
+- Xan DPCM audio decoder (Mario Brito)
+- Interplay MVE demuxer and DPCM audio decoder (Mike Melanson)
+- Duck DK3 and DK4 ADPCM audio decoders (Mike Melanson)
+
+version 0.4.7:
 
 - RealAudio 1.0 (14_4) and 2.0 (28_8) native decoders. Author unknown, code from a mplayerhq
   (originally from public domain player for Amiga at http://www.honeypot.net/audio)
@@ -32,6 +40,9 @@ Upcoming version 0.4.7:
 - b frame encoding speedup (Michael)
 - wmv2 codec (unfinished - Michael)
 - user specified diamond size for EPZS (Michael)
+- Playstation STR playback subsystem, still experimental (Mike and Michael)
+- ASV2 codec (Michael)
+- CLJR decoder (Alex)
 
 .. And lots more new enhances and fixes.
 
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 72f04ee2fb..f0ccfc270c 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -626,6 +626,8 @@ library:
 @tab used in Quake III, Jedi Knight 2, other computer games
 @item Interplay MVE    @tab    @tab X
 @tab format used in various Interplay computer games
+@item WC3 Movie        @tab    @tab X
+@tab multimedia format used in Origin's Wing Commander III computer game
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.
@@ -678,6 +680,7 @@ following image formats are supported:
 @item 4X Video               @tab     @tab  X @tab used in certain computer games
 @item Sony Playstation MDEC  @tab     @tab  X 
 @item Id RoQ                 @tab     @tab  X @tab used in Quake III, Jedi Knight 2, other computer games
+@item Xan/WC3                @tab     @tab  X @tab used in Wing Commander III .MVE files
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.
@@ -702,6 +705,10 @@ solutions.
 @item MS IMA ADPCM           @tab X    @tab X
 @item QT IMA ADPCM           @tab      @tab X
 @item 4X IMA ADPCM           @tab      @tab X
+@item Duck DK3 IMA ADPCM     @tab      @tab X
+@tab used in some Sega Saturn console games
+@item Duck DK4 IMA ADPCM     @tab      @tab X
+@tab used in some Sega Saturn console games
 @item RA144                  @tab      @tab X
 @tab Real 14400 bit/s codec
 @item RA288                  @tab      @tab X
@@ -713,6 +720,8 @@ solutions.
 @tab used in Quake III, Jedi Knight 2, other computer games
 @item Interplay MVE DPCM     @tab      @tab X
 @tab used in various Interplay computer games
+@item Xan DPCM               @tab      @tab X
+@tab used in Origin's Wing Commander IV AVI files
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.