summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2007-09-28 16:45:41 +0000
committerVitor Sessak <vitor1001@gmail.com>2007-09-28 16:45:41 +0000
commita1748c6744d0ec582b8585cfaad0d233dbb4709a (patch)
tree16f70653daea029dc4aa5b03cda8f8543de4dd0d
parent3576f9c6298ca1435fd577ca4933990f6fa31d66 (diff)
Documentation update for AMV audio decoder
Originally committed as revision 10609 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Changelog1
-rw-r--r--doc/general.texi2
2 files changed, 3 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 97326f930f..835bef108c 100644
--- a/Changelog
+++ b/Changelog
@@ -95,6 +95,7 @@ version <next>
- Matroska muxer
- Slice-based parallel H.264 decoding
- Monkey's Audio demuxer and decoder
+- AMV audio decoder
version 0.4.9-pre1:
diff --git a/doc/general.texi b/doc/general.texi
index 542233fbf6..bf5815e33e 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -249,6 +249,8 @@ following image formats are supported:
@item AAC @tab X @tab X
@tab Supported through the external library libfaac/libfaad.
@item Microsoft ADPCM @tab X @tab X
+@item AMV IMA ADPCM @tab @tab X
+@tab Used in AMV files
@item MS IMA ADPCM @tab X @tab X
@item QT IMA ADPCM @tab @tab X
@item 4X IMA ADPCM @tab @tab X