aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-06-05 16:34:01 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-12-09 18:50:38 +0100
commit160013736e40744989c8fc7dd1000980d00cf02d (patch)
treeab5223474c295cb240ee2ea4b47a121f21ed7a36 /doc/general.texi
parent18eb31963b9e5b343b934df98ed32bc7d13006f4 (diff)
downloadffmpeg-160013736e40744989c8fc7dd1000980d00cf02d.tar.gz
lavf: TED Talks JSON captions demuxer.
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 6bed7b54d0..ed1269f091 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -924,6 +924,7 @@ performance on systems without hardware floating point support).
@item SAMI @tab @tab X @tab @tab X
@item SubRip (SRT) @tab X @tab X @tab X @tab X
@item SubViewer @tab @tab X @tab @tab X
+@item TED Talks captions @tab @tab X @tab @tab X
@item VobSub (IDX+SUB) @tab @tab X @tab @tab X
@item 3GPP Timed Text @tab @tab @tab X @tab X
@item WebVTT @tab @tab X @tab @tab X