diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-22 19:24:17 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2011-04-23 00:34:22 +0300 |
commit | 6ffd7eddb832a21f51661038620ef655640ee83f (patch) | |
tree | 5685e7cb2ae79a436255bd63e956d2ac2aa66f5d /doc/general.texi | |
parent | 84465f2180308a3e998089517e76586563fd6162 (diff) | |
download | ffmpeg-6ffd7eddb832a21f51661038620ef655640ee83f.tar.gz |
doc: FLV muxing is supported.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc/general.texi')
-rw-r--r-- | doc/general.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index edd5e60cc3..303159eba7 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -96,7 +96,7 @@ library: @tab Only embedded audio is decoded. @item FLI/FLC/FLX animation @tab @tab X @tab .fli/.flc files -@item Flash Video (FLV) @tab @tab X +@item Flash Video (FLV) @tab X @tab X @tab Macromedia Flash video files @item framecrc testing format @tab X @tab @item FunCom ISS @tab @tab X |