diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:03:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:19:26 +0100 |
| commit | 2cf521718d9427329b9324b00fb59caddcf42782 (patch) | |
| tree | 3802359d7d10019217a6d63c5ada55c6373a8c96 /doc/general.texi | |
| parent | c0f02b220182cc7997bd6b5279881b898f52dfbf (diff) | |
| parent | 35c6ce76b107225a19eb33aea38857d2405882af (diff) | |
| download | ffmpeg-2cf521718d9427329b9324b00fb59caddcf42782.tar.gz | |
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
Canopus HQX decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -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 0aaaf9d6cf..6c9531b03e 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -253,6 +253,7 @@ 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 HQX @tab @tab X @item CD+G @tab @tab X @tab Video format used by CD+G karaoke disks @item Phantom Cine @tab @tab X |