diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-02-21 19:33:26 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-03-07 01:44:59 +0100 |
| commit | d95143ec82a026967e10a4521a5de78fb5cb2ec1 (patch) | |
| tree | 87dd075a84afae7053c4b0121e7df0bc9a933b9b /doc | |
| parent | 9167db3829f360f241255d4240ba6b7135ab4111 (diff) | |
| download | ffmpeg-streaming-d95143ec82a026967e10a4521a5de78fb5cb2ec1.zip ffmpeg-streaming-d95143ec82a026967e10a4521a5de78fb5cb2ec1.tar.gz | |
lavf/segment: add support to ffconcat segment list
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/demuxers.texi | 1 | ||||
| -rw-r--r-- | doc/muxers.texi | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index f9c86e7..0861287 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -29,6 +29,7 @@ the caller can decide which variant streams to actually receive. The total bitrate of the variant that the stream belongs to is available in a metadata key named "variant_bitrate". +@anchor{concat} @section concat Virtual concatenation script demuxer. diff --git a/doc/muxers.texi b/doc/muxers.texi index 5ba92c3..9d119c3 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -579,6 +579,13 @@ auto-select this format. @code{ext} is deprecated in favor or @code{csv}. +@item ffconcat +Generate an ffconcat file for the created segments. The resulting file +can be read using the FFmpeg @ref{concat} demuxer. + +A list file with the suffix @code{".ffcat"} or @code{".ffconcat"} will +auto-select this format. + @item m3u8 Generate an extended M3U8 file, version 3, compliant with @url{http://tools.ietf.org/id/draft-pantos-http-live-streaming}. |
