aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Marston <rmarston@gmail.com>2008-04-15 20:51:23 +0000
committerDiego Biurrun <diego@biurrun.de>2008-04-15 20:51:23 +0000
commit74118c07c7810da771b705e7c052e9c3eac3b940 (patch)
treea3c2b35a4c2c2eca5c8f1166d5496760e52756a4
parentfc9b22dd2e5de851a89245b5357e710b93587278 (diff)
downloadffmpeg-74118c07c7810da771b705e7c052e9c3eac3b940.tar.gz
documentation update for new Maxis EA XA decoder/demuxer
patch by Robert Marston, rmarston gmail com Originally committed as revision 12840 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Changelog1
-rw-r--r--doc/general.texi4
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index ba22b1122b..37842b438c 100644
--- a/Changelog
+++ b/Changelog
@@ -119,6 +119,7 @@ version <next>
- IFF demuxer
- 8SVX audio decoder
- BFI demuxer
+- MAXIS EA XA (.xa) demuxer / decoder
version 0.4.9-pre1:
diff --git a/doc/general.texi b/doc/general.texi
index 31747feb7a..0ce7bf19ca 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -94,6 +94,8 @@ library:
@item Matroska @tab X @tab X
@item Electronic Arts Multimedia @tab @tab X
@tab Used in various EA games; files have extensions like WVE and UV2.
+@item MAXIS EA XA @tab @tab X
+@tab Used in Sim City 3000; file extension .xa.
@item Nullsoft Video (NSV) format @tab @tab X
@item ADTS AAC audio @tab X @tab X
@item Creative VOC @tab X @tab X @tab Created for the Sound Blaster Pro.
@@ -292,6 +294,8 @@ following image formats are supported:
@tab Used in Sega Dreamcast games.
@item Electronic Arts ADPCM @tab @tab X
@tab Used in various EA titles.
+@item MAXIS EA ADPCM @tab @tab X
+@tab Used in Sim City 3000.
@item Creative ADPCM @tab @tab X
@tab 16 -> 4, 8 -> 4, 8 -> 3, 8 -> 2
@item THP ADPCM @tab @tab X