From patchwork Mon Mar 6 22:20:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 2774 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp293181vsy; Mon, 6 Mar 2017 14:20:50 -0800 (PST) X-Received: by 10.28.30.19 with SMTP id e19mr14810371wme.52.1488838850802; Mon, 06 Mar 2017 14:20:50 -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 h7si16200051wma.160.2017.03.06.14.20.50; Mon, 06 Mar 2017 14:20:50 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACA52688263; Tue, 7 Mar 2017 00:20:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0C25680469 for ; Tue, 7 Mar 2017 00:20:13 +0200 (EET) Received: by mail-lf0-f52.google.com with SMTP id y193so79019445lfd.3 for ; Mon, 06 Mar 2017 14:20:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=FC8FcSCQuJO1YUdD7t9UvqdygDIRpyp5PBICKX3C/AY=; b=KWT/fuZ8SNbLYKbNr0V5/Fm2fKE7Y/8SdS2HKe9KFfhG+zlAKXgV6nlqImnkTmjtvL HYcFyV0gUpZzzM89YzG6yFRafF3L4qu3iA4x8ObB2PPiwx93qn1aIfxGX12xR0Lxtew2 LEIHs79y6Q4Vrb2PeOQLVybVJcigkHklA0T3WU8ahYd2eo/c6pri7bf56FdW0gqZqvfK XhjkisVngt1by116m/hxl1HlCehBjVkmb9EkH3G5nvY5Kt3TFhPMY3U2cZPj+3H5lM6r Uk6PJLhCpi6lMZ8zgaGO+BOi47P079thCwg4ol/Q8xvG3+dXKFjz4EVNUQr5ovpyxBA5 vuqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=FC8FcSCQuJO1YUdD7t9UvqdygDIRpyp5PBICKX3C/AY=; b=ZhufW7Myx+6O5Ro1CbWmfUoCb+exM6V4RjoAs8W7Xon38yUnKLSb/J7pyFZIlwxY56 8aDST1bhdHt374HhmOwX0kJcZAExGtGCvV14nl9B0G5J7PUIZ8sy5p05E0YCKaR5ba2B U7RVRueshDAPRQjP7ngN0e2U+alSIvlOf6w+SUxSNznlsHSkWTC/f3yjXQctyQQtVYWq SspGXMVjO+89sqnohG8uPa+Uw6xHFMEI6GUmsodAUcDAeLgT8k02irM/CcDBgEt0HY5o Jazjp6HnTCXkKxWyFp3qlLV+S+2zSxgDz0z8NP37ZZAGeiVLhdmU6f+C0dtx0BKk0vfu Ho3w== X-Gm-Message-State: AMke39lplK7PGoS7zCzxrvZ2c5fw8dTeOO8A3jHayO3e/SurHYPxsDMvQXeAQW7XFD0d4A== X-Received: by 10.25.79.69 with SMTP id a5mr5489698lfk.58.1488838825766; Mon, 06 Mar 2017 14:20:25 -0800 (PST) Received: from localhost.localdomain (a88-114-245-102.elisa-laajakaista.fi. [88.114.245.102]) by smtp.gmail.com with ESMTPSA id e102sm1729749lfi.0.2017.03.06.14.20.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 14:20:24 -0800 (PST) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Mar 2017 00:20:21 +0200 Message-Id: <20170306222021.17917-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170306222021.17917-1-jeebjp@gmail.com> References: <20170306222021.17917-1-jeebjp@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] doc/encoders: remove mentions of the x264opts AVOption 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" --- doc/encoders.texi | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 594c612..ee28b9b 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1762,9 +1762,9 @@ for detail retention (adaptive quantization, psy-RD, psy-trellis). Many libx264 encoder options are mapped to FFmpeg global codec options, while unique encoder options are provided through private -options. Additionally the @option{x264opts} and @option{x264-params} -private options allows one to pass a list of key=value tuples as accepted -by the libx264 @code{x264_param_parse} function. +options. Additionally the @option{x264-params} private option allows one +to pass a list of key=value tuples as accepted by the libx264 +@code{x264_param_parse} function. The x264 project website is at @url{http://www.videolan.org/developers/x264.html}. @@ -2094,19 +2094,6 @@ Variable bit rate. Constant bit rate (not allowed in MP4 container). @end table -@item x264opts (N.A.) -Set any x264 option, see @command{x264 --fullhelp} for a list. - -Argument is a list of @var{key}=@var{value} couples separated by -":". In @var{filter} and @var{psy-rd} options that use ":" as a separator -themselves, use "," instead. They accept it as well since long ago but this -is kept undocumented for some reason. - -For example to specify libx264 encoding options with @command{ffmpeg}: -@example -ffmpeg -i foo.mpg -vcodec libx264 -x264opts keyint=123:min-keyint=20 -an out.mkv -@end example - @item a53cc @var{boolean} Import closed captions (which must be ATSC compatible format) into output. Only the mpeg2 and h264 decoders provide these. Default is 1 (on). @@ -2115,11 +2102,11 @@ Only the mpeg2 and h264 decoders provide these. Default is 1 (on). Override the x264 configuration using a :-separated list of key=value parameters. -This option is functionally the same as the @option{x264opts}, but is -duplicated for compatibility with the Libav fork. - For example to specify libx264 encoding options with @command{ffmpeg}: @example +ffmpeg -i foo.mpg -vcodec libx264 -x264opts keyint=123:min-keyint=20 -an out.mkv +@end example +@example ffmpeg -i INPUT -c:v libx264 -x264-params level=30:bframes=0:weightp=0:\ cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:\ no-fast-pskip=1:subq=6:8x8dct=0:trellis=0 OUTPUT