From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Mon, 21 Jan 2008 18:06:45 +0000 (+0000)
Subject: mention avm2 (flash 9) muxer in documentation and changelog
X-Git-Tag: v0.5~6378
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b264a084b19b12f16d253ee34cfe43f6de44fe88;p=coroid%2Fffmpeg_saccubus.git

mention avm2 (flash 9) muxer in documentation and changelog

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

diff --git a/Changelog b/Changelog
index 441ae1a20..3249c60c5 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 86f00f56d..899f426f9 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