From patchwork Fri Nov 11 00:27:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Thelen X-Patchwork-Id: 1379 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1139515vsb; Thu, 10 Nov 2016 16:28:08 -0800 (PST) X-Received: by 10.194.108.131 with SMTP id hk3mr6750547wjb.102.1478824088425; Thu, 10 Nov 2016 16:28:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kk10si7806123wjc.3.2016.11.10.16.28.08; Thu, 10 Nov 2016 16:28:08 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CC73689ED4; Fri, 11 Nov 2016 02:28:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from caladan.c-14.de (caladan.c-14.de [78.47.48.217]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EC35689E29 for ; Fri, 11 Nov 2016 02:27:57 +0200 (EET) Received: from salusa-secundus.dune (HSI-KBW-046-005-088-254.hsi8.kabel-badenwuerttemberg.de [46.5.88.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by caladan.c-14.de (Postfix) with ESMTPSA id E48461AF26B for ; Fri, 11 Nov 2016 00:27:59 +0000 (UTC) From: Simon Thelen To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Nov 2016 01:27:12 +0100 Message-Id: <20161111002712.25263-1-ffmpeg-dev@c-14.de> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] doc/ffmpeg: add documentation for the disposition option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Simon Thelen --- 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 +@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: +@table @option +@item default +@item dub +@item original +@item comment +@item lyrics +@item karaoke +@item forced +@item hearing_impaired +@item visual_impaired +@item clean_effects +@item captions +@item descriptions +@item metadata +@end table + +For example, to make the second audio stream the default stream: +@example +ffmpeg -i in.mkv -disposition:a:1 default out.mkv +@end example + +To make the second subtitle stream the default stream and remove the default +disposition from the first subtitle stream: +@example +ffmpeg -i INPUT -disposition:s:0 0 -disposition:s:1 default OUTPUT +@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