aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-02-14 17:36:20 +0000
committerDiego Biurrun <diego@biurrun.de>2012-02-14 22:32:53 +0100
commitdc4e57489fa0f9cf4faf4c85cc405d6db77d84db (patch)
tree3bac4e2127c94dc0c1388ceec175aa68992f0b76 /doc/general.texi
parentc1df37e59b516e9da47f0e9f7df748beafb2fc90 (diff)
downloadffmpeg-dc4e57489fa0f9cf4faf4c85cc405d6db77d84db.tar.gz
CDXL demuxer and decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 50ae764541..14624bc521 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -131,6 +131,8 @@ library:
@tab Multimedia format used by Delphine Software games.
@item CD+G @tab @tab X
@tab Video format used by CD+G karaoke disks
+@item Commodore CDXL @tab @tab X
+ @tab Amiga CD video format
@item Core Audio Format @tab @tab X
@tab Apple Core Audio Format
@item CRC testing format @tab X @tab
@@ -435,6 +437,8 @@ following image formats are supported:
@tab fourcc: CSCD
@item CD+G @tab @tab X
@tab Video codec for CD+G karaoke disks
+@item CDXL @tab @tab X
+ @tab Amiga CD video codec
@item Chinese AVS video @tab E @tab X
@tab AVS1-P2, JiZhun profile, encoding through external library libxavs
@item Delphine Software International CIN video @tab @tab X