diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-23 16:47:10 +0200 |
| commit | 5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e (patch) | |
| tree | 38b5f7b209f392584c6829a0dd1fd84a9b70bec1 /doc/general.texi | |
| parent | cc0dc50d027b8aca27b07ef5cededde2e9d96d57 (diff) | |
| parent | b4cfb8254eeeb2fc0aa2c0c36a5ede208af47a79 (diff) | |
| download | ffmpeg-5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dnxhddec: avoid a branch in 10-bit decode_dct_block()
H.264: Add optimizations to predict x86 assembly.
riff: Add mpgv MPEG-2 fourcc
add Flash Screen Video 2 decoder
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 bd17f9056f..c5045b1095 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -401,7 +401,7 @@ following image formats are supported: @tab experimental lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X @tab fourcc: FSV1 -@item Flash Screen Video v2 @tab X +@item Flash Screen Video v2 @tab X @tab X @item Flash Video (FLV) @tab X @tab X @tab Sorenson H.263 used in Flash @item Fraps @tab @tab X |