[FFmpeg-cvslog] doc/ffmpeg: add documentation for the disposition option

[Simon Thelen]

ffmpeg | branch: master | Simon Thelen <ffmpeg-dev at c-14.de> | Fri Nov 11 01:27:12 2016 +0100| [cd5da01daab7813f8215b1215cfe4cfcdc7a1ab4] | committer: Michael Niedermayer

doc/ffmpeg: add documentation for the disposition option

Signed-off-by: Simon Thelen <ffmpeg-dev at c-14.de>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd5da01daab7813f8215b1215cfe4cfcdc7a1ab4
---

 doc/ffmpeg.texi | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index fd8a0c1..4b159fd 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -357,6 +357,40 @@ To set the language of the first audio stream:
 ffmpeg -i INPUT -metadata:s:a:0 language=eng OUTPUT
 @end example
 
+ at item -disposition[:stream_specifier] @var{value} (@emph{output,per-stream})
+Sets the disposition for a stream.
+
+This option overrides the disposition copied from the input stream. It is also
+possible to delete the disposition by setting it to 0.
+
+The following dispositions are recognized:
+ at table @option
+ at item default
+ at item dub
+ at item original
+ at item comment
+ at item lyrics
+ at item karaoke
+ at item forced
+ at item hearing_impaired
+ at item visual_impaired
+ at item clean_effects
+ at item captions
+ at item descriptions
+ at item metadata
+ at end table
+
+For example, to make the second audio stream the default stream:
+ at example
+ffmpeg -i in.mkv -disposition:a:1 default out.mkv
+ at end example
+
+To make the second subtitle stream the default stream and remove the default
+disposition from the first subtitle stream:
+ at example
+ffmpeg -i INPUT -disposition:s:0 0 -disposition:s:1 default OUTPUT
+ at end example
+
 @item -program [title=@var{title}:][program_num=@var{program_num}:]st=@var{stream}[:st=@var{stream}...] (@emph{output})
 
 Creates a program with the specified @var{title}, @var{program_num} and adds the specified