aboutsummaryrefslogtreecommitdiffstats
path: root/doc/muxers.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-02-21 19:33:26 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-03-07 01:44:59 +0100
commitd95143ec82a026967e10a4521a5de78fb5cb2ec1 (patch)
tree87dd075a84afae7053c4b0121e7df0bc9a933b9b /doc/muxers.texi
parent9167db3829f360f241255d4240ba6b7135ab4111 (diff)
downloadffmpeg-d95143ec82a026967e10a4521a5de78fb5cb2ec1.tar.gz
lavf/segment: add support to ffconcat segment list
Diffstat (limited to 'doc/muxers.texi')
-rw-r--r--doc/muxers.texi7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 5ba92c3adf..9d119c39a1 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}.