diff options
author | Nicolas George <george@nsup.org> | 2014-02-26 20:22:46 +0100 |
---|---|---|
committer | Nicolas George <george@nsup.org> | 2014-03-23 19:15:07 +0100 |
commit | 26dea7731e00cac3d9b47c68f26af36ce57b24d1 (patch) | |
tree | d36d1597c84b81eef5c0737062db0b382c4afb39 /doc/demuxers.texi | |
parent | cc6d549adbb838ef87b1f251ca469dc4c3dd39aa (diff) | |
download | ffmpeg-26dea7731e00cac3d9b47c68f26af36ce57b24d1.tar.gz |
lavf/concatdec: allow to match streams by id.
That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.
Diffstat (limited to 'doc/demuxers.texi')
-rw-r--r-- | doc/demuxers.texi | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 1ea796bfce..ada8644b76 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -74,7 +74,7 @@ following directive is recognized: Path to a file to read; special characters and spaces must be escaped with backslash or single quotes. -All subsequent directives apply to that file. +All subsequent file-related directives apply to that file. @item @code{ffconcat version 1.0} Identify the script type and version. It also sets the @option{safe} option @@ -92,6 +92,22 @@ file is not available or accurate. If the duration is set for all files, then it is possible to seek in the whole concatenated video. +@item @code{stream} +Introduce a stream in the virtual file. +All subsequent stream-related directives apply to the last introduced +stream. +Some streams properties must be set in order to allow identifying the +matching streams in the subfiles. +If no streams are defined in the script, the streams from the first file are +copied. + +@item @code{exact_stream_id @var{id}} +Set the id of the stream. +If this directive is given, the string with the corresponding id in the +subfiles will be used. +This is especially useful for MPEG-PS (VOB) files, where the order of the +streams is not reliable. + @end table @subsection Options |