[SCM] libav/experimental: mention avm2 (flash 9) muxer in documentation and changelog

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:12:07 UTC 2013


The following commit has been merged in the experimental branch:
commit b264a084b19b12f16d253ee34cfe43f6de44fe88
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Jan 21 18:06:45 2008 +0000

    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 441ae1a..3249c60 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 86f00f5..899f426 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -52,6 +52,7 @@ library:
 @item AVI at tab X @tab X
 @item WAV at tab X @tab X
 @item Macromedia Flash at tab X @tab X
+ at 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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list