summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-10-11 17:16:57 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-10-11 17:16:57 +0000
commitd7a3a783ad2264f7477514be0db8e27eac88b173 (patch)
tree088173ed194b1a02afcf0109eb3fc2ed9e0bfd0d /doc
parentdc56e0de1d14f06489d03ba5b58146e8de36aac9 (diff)
update GXF status and add description
Originally committed as revision 6661 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 46148df9ff..adb594610b 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -734,7 +734,8 @@ library:
@tab Multimedia format used by the Creature Shock game.
@item Smacker @tab @tab X
@tab Multimedia format used by many games.
-@item GXF @tab @tab X
+@item GXF @tab X @tab X
+@tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley playout servers.
@item CIN @tab @tab X
@tab Multimedia format used by Delphine Software games.
@end multitable