summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Tison <blackspike@gmail.com>2009-12-17 17:25:31 +0000
committerVitor Sessak <vitor1001@gmail.com>2009-12-17 17:25:31 +0000
commita3d995c1eb98e38186bf9ed677809c442a7dab35 (patch)
tree51b3b6facfc2c95a6b80e5feea5d8d9abcde9b36 /doc
parent8993535cbbbcd7561164260d547ad51484397785 (diff)
CD+G demuxer and decoder
Patch by Michael Tison (gmail address: blackspike@....) Originally committed as revision 20890 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 17c080488b..67c2a13517 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -63,6 +63,8 @@ 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 CD+G @tab @tab X
+ @tab Video format used by CD+G karaoke disks
@item Core Audio Format @tab @tab X
@tab Apple Core Audio Format
@item CRC testing format @tab X @tab
@@ -329,6 +331,8 @@ following image formats are supported:
@tab Codec used in Cyberia game.
@item CamStudio @tab @tab X
@tab fourcc: CSCD
+@item CD+G @tab @tab X
+ @tab Video codec for CD+G karaoke disks
@item Chinese AVS video @tab @tab X
@tab AVS1-P2, JiZhun profile
@item Delphine Software International CIN video @tab @tab X