diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 21:44:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 22:18:41 +0100 |
| commit | 209001073adf190ccf2e578f25d4b3d41b1640a0 (patch) | |
| tree | 11d04d4bd1eb083cfe3019bddd5e99587026fef7 /doc | |
| parent | e46a7fdc8748c286e391c1e7f2921d98a4486681 (diff) | |
| parent | 217e4ff4d1f845b76e44634e29371cd09313d1c2 (diff) | |
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
dca: Support for XLL (lossless extension)
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 38ae84a098..a8e4f377ec 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -906,6 +906,7 @@ following image formats are supported: @item COOK @tab @tab X @tab All versions except 5.1 are supported. @item DCA (DTS Coherent Acoustics) @tab X @tab X + @tab supported extensions: XCh, XLL (partially) @item DPCM id RoQ @tab X @tab X @tab Used in Quake III, Jedi Knight 2 and other computer games. @item DPCM Interplay @tab @tab X |