summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-10 21:01:19 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-11 22:27:25 +0100
commit8f948b6244e4e25156fc075c139f9ebd7a3a4bd1 (patch)
treef4f048943d2ee00fbd27afa5178615dcb0e2ae69 /doc/ffmpeg.texi
parent676a93f2d86d704ab6a973a19000e265c14e37d5 (diff)
ffmpeg: Add basic support to mux multiple programs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index cf74734dd6..6307470d08 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -355,6 +355,11 @@ To set the language of the first audio stream:
ffmpeg -i INPUT -metadata:s:a:0 language=eng OUTPUT
@end example
+@item -program [title=@var{title}:]st=@var{stream}[:st=@var{stream}...] (@emph{output})
+
+Creates a program with the specified @var{title} and adds the specified
+@var{stream}(s) to it.
+
@item -target @var{type} (@emph{output})
Specify target file type (@code{vcd}, @code{svcd}, @code{dvd}, @code{dv},
@code{dv50}). @var{type} may be prefixed with @code{pal-}, @code{ntsc-} or