diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:31:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:31:26 +0100 |
| commit | dfe5a9f022b38ba292212ce2daff60221e411e10 (patch) | |
| tree | b641963626d99ac6db929e48367b67f9d8140df6 /doc | |
| parent | 99bcfe62278ffc11e2665e653dcb90336ec8d7ff (diff) | |
| parent | c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b (diff) | |
| download | ffmpeg-streaming-dfe5a9f022b38ba292212ce2daff60221e411e10.zip ffmpeg-streaming-dfe5a9f022b38ba292212ce2daff60221e411e10.tar.gz | |
Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
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 197a800..16a495a 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -898,6 +898,7 @@ following image formats are supported: @tab decoding supported through external library libcelt @item Delphine Software International CIN audio @tab @tab X @tab Codec used in Delphine Software International games. +@item Digital Speech Standard - Standard Play mode (DSS SP) @tab @tab X @item Discworld II BMV Audio @tab @tab X @item COOK @tab @tab X @tab All versions except 5.1 are supported. |
