diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
| commit | 5a284d076ffdca705204e3e4100917cd4dbda14c (patch) | |
| tree | 409db710f32304c4192b2cebf4446bb0242b8189 /doc/general.texi | |
| parent | fcca7671e29b67812d29af710ff90486944ee428 (diff) | |
| parent | 22526c1f557a72b3285d295bd8b30c40eb65d437 (diff) | |
| download | ffmpeg-5a284d076ffdca705204e3e4100917cd4dbda14c.tar.gz | |
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
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, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index a826a1da54..ba79503d3f 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -254,6 +254,8 @@ library: @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 Canopus HQ @tab @tab X +@item Canopus HQA @tab @tab X @item Canopus HQX @tab @tab X @item CD+G @tab @tab X @tab Video format used by CD+G karaoke disks |