aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-21 18:06:45 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-21 18:06:45 +0000
commitb264a084b19b12f16d253ee34cfe43f6de44fe88 (patch)
tree40c47183ab38a837ae38a0acf7866e3465a126d0
parent29e35d67766edf67ba470add620e3c3e879e8195 (diff)
downloadffmpeg-b264a084b19b12f16d253ee34cfe43f6de44fe88.tar.gz
mention avm2 (flash 9) muxer in documentation and changelog
Originally committed as revision 11591 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Changelog1
-rw-r--r--doc/general.texi1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 441ae1a204..3249c60c5e 100644
--- a/Changelog
+++ b/Changelog
@@ -109,6 +109,7 @@ version <next>
- Sun Rasterfile decoder
- TechnoTrend PVA demuxer
- Linux Media Labs MPEG-4 (LMLM4) demuxer
+- AVM2 (Flash 9) SWF muxer
version 0.4.9-pre1:
diff --git a/doc/general.texi b/doc/general.texi
index 86f00f56dc..899f426f91 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -52,6 +52,7 @@ library:
@item AVI@tab X @tab X
@item WAV@tab X @tab X
@item Macromedia Flash@tab X @tab X
+@item AVM2 (Flash 9) @tab X @tab X
@tab Only embedded audio is decoded.
@item FLV @tab X @tab X
@tab Macromedia Flash video files