diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 23:44:58 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 23:44:58 +0300 |
| commit | e821910a21510c2423c345b615602b42af26a70a (patch) | |
| tree | 3ab3c71873b2077a21007c26d94ce38400b1d372 /doc | |
| parent | dfe5a9f022b38ba292212ce2daff60221e411e10 (diff) | |
| parent | 062cd5a975ff7bd6fb91f9b4d1d9d102a7545499 (diff) | |
Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/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 16a495ac43..0aaaf9d6cf 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -252,6 +252,7 @@ library: @tab Used in the game Cyberia from Interplay. @item Delphine Software International CIN @tab @tab X @tab Multimedia format used by Delphine Software games. +@item Digital Speech Standard (DSS) @tab @tab X @item CD+G @tab @tab X @tab Video format used by CD+G karaoke disks @item Phantom Cine @tab @tab X |