diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:21:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:22:24 +0200 |
| commit | 674216991d409316155695baeb6b69c22c758815 (patch) | |
| tree | 97b390e16c5f2378f193499224a05445d9715bd0 /doc/general.texi | |
| parent | af285072b5d226bb0032b8576d132d01e2d22fa1 (diff) | |
| parent | 47aed43990e2bf31d0599d5ac862afa5e264a601 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Fix APE tag dependencies
MS Expression Encoder Screen decoder
libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 589ca12368..4dea3f2179 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -578,6 +578,8 @@ following image formats are supported: @item lossless MJPEG @tab X @tab X @item Microsoft ATC Screen @tab @tab X @tab Also known as Microsoft Screen 3. +@item Microsoft Expression Encoder Screen @tab @tab X + @tab Also known as Microsoft Titanium Screen 2. @item Microsoft RLE @tab @tab X @item Microsoft Screen 1 @tab @tab X @tab Also known as Windows Media Video V7 Screen. |