lavf: TED Talks JSON captions demuxer.

2 files changed, 22 insertions, 0 deletions

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 126dd1d18d..1187b6a01e 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -215,4 +215,25 @@ backslash or single quotes.
 
 @end table
 
+@section tedcaptions
+
+JSON captions used for @url{http://www.ted.com/, TED Talks}.
+
+TED does not provide links to the captions, but they can be guessed from the
+page. The file @file{tools/bookmarklets.html} from the FFmpeg source tree
+contains a bookmarklet to expose them.
+
+This demuxer accepts the following option:
+@table @option
+@item start_time
+Set the start time of the TED talk, in milliseconds. The default is 15000
+(15s). It is used to sync the captions with the downloadable videos, because
+they include a 15s intro.
+@end table
+
+Example: convert the captions to a format most players understand:
+@example
+ffmpeg -i http://www.ted.com/talks/subtitles/id/1/lang/en talk1-en.srt
+@end example
+
 @c man end INPUT DEVICES
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