From patchwork Fri Feb 23 08:08:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7720 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp386815jai; Fri, 23 Feb 2018 00:08:23 -0800 (PST) X-Google-Smtp-Source: AH8x225GriYHTriRGHT4lbe0gBuO9nhblqjhK4ONF9SjJ+cPExu3ypY4Gh3vbHv5HPGQyVHNncVz X-Received: by 10.223.131.230 with SMTP id 93mr718102wre.59.1519373303387; Fri, 23 Feb 2018 00:08:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519373303; cv=none; d=google.com; s=arc-20160816; b=KPoaW6XC4JZqK0vpGQF/mgufQPheWsDkSc/pzkhoq27jDVWvkqBtI/jNYXdoo8rs3T bodufy14grXkMm9HcmmDRoSDUnk8d2hKLSxXQMgt8ibi7idW7uZVWeUTDT7jckztLBGO t1BHt9128V7Jm0Bid9C28ys7Fieqqt+PMUQTtGpjqn4rz3+Vkc/JJsiFwWCWzNYktI6L NREbfgBHXwuYLsbEakUeMGSS3mUibqNBFv64IRfnO9S5YBOzJLRit0OUtdVC681jgioZ rnq92G1uvJokaaFL8WQFpCWO39Ki8gVrF2b2V4OjO914HJgYEbKzFRUn7DbIx0WYrok7 TNFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=CzqpLT/vmaOy19WLxHHI4xJUKgtxw7l7zo2LtBcPovw=; b=TQvZBb0PAjTYAA7x5zCAFd/cVKyLL4dLOzeuHUFDLPI1n4TGtMNhRdqxBAkYNpubzV 9yiM5WcfjG19YfaEC0qnP3jW9k5rpGHa1YzBq+kyu0oPi74R3F6l4S10QItnUE+HdqLn fSajzul/U9dwF60aXHbkEML2QeopHxUp8ZSl+T+WEGlkgWRdoVnmQgYTWphypjGo06OY zbUsP6JN+vjGTICc2j1JWVQRGhWoJLCQNO4YPrLuMUrFU4FYIbmFmy8bZNuS9RTw1vb3 rw1PDm3VSTImZWS6ZabX1EmJ4mE8MMKR3MLPIyLXfxrD0hfj3Lv4yI50/FE6+Hm79FUs 26/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gVxNC64A; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t19si917776wrg.15.2018.02.23.00.08.22; Fri, 23 Feb 2018 00:08:23 -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 header.s=20161025 header.b=gVxNC64A; 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=QUARANTINE 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 D546668A39A; Fri, 23 Feb 2018 10:08:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f50.google.com (mail-pg0-f50.google.com [74.125.83.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DBC668A1C5 for ; Fri, 23 Feb 2018 10:08:12 +0200 (EET) Received: by mail-pg0-f50.google.com with SMTP id g2so3087428pgn.7 for ; Fri, 23 Feb 2018 00:08:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=Lg5KIoiOb6okeCHhR9Tzb7p8qds9jI7XNIobGb7SXaA=; b=gVxNC64ATdsRuHDk1sWEWOts+GHu1Ovhiq0qs6+xIlN/sXDXcrTI6MqdWz8thdapwb CR8vBaTSlqBcoU27+eTjxhmPFzM1MuocCUT1aRxnm4jcydE/fWyFYT1SbPSwHotZSn1e NsEqKptl9STpCm9+MxQUeq7KVMRxiLgknY1W9Vk9G/YGmkVZGvkWTv7hwLYR7UnEOyGr 9Q3Z00hv/kEzx7Hkq3+LRHNYuMYiaqv4bkx459yQ2squECaSI/TwyAEopYeAPEo2Xq6V y7PVx/hV7C9zujLMkglxfbi59SOMlDSSJ09DSlYF30ZYBJtE75hMjMSQs+OehAiKP/xf 9SfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=Lg5KIoiOb6okeCHhR9Tzb7p8qds9jI7XNIobGb7SXaA=; b=YdLrTCZ23ceePVgDKp9X6EXjUidqZay9Mw21WfT399DnhrTbTMhJ7QNwNpxhOwu+Tp K2wgIN/wdGKzsbU5mg5e4/5/faltAbmplMJseMLb9k8KKVzeEJ+W+weJPzpAWS66Y75u sPIWcqPy5agd3Mcy5WzG1DWC6x2AVmQuWKMNMA8B4hkBuURTZymqs/6SNk0lNgCJ5ywp 4PNZ3swgcdr8WSUVuJIrhBdi5xORLSj4EENnEKOWg7L/L/DHpXIH+etmtmwu7XXnDOdh GAgRDn8u8JP5lmUEtRlh1u+LJmPeZ9tvIW2IA1bC65jQWsqhXpNJLgyfka75bFLtBfaD b0Kw== X-Gm-Message-State: APf1xPDrDKp3kRtG0dU7j7kY8ZJ8w9tFXDbK8VEyv5CAOTffe6+6eGCS 4WWZQLfc0qFhdScgcE4wvVVzSI1X X-Received: by 10.99.52.203 with SMTP id b194mr794836pga.349.1519373293116; Fri, 23 Feb 2018 00:08:13 -0800 (PST) Received: from [10.67.68.22] ([192.55.54.41]) by smtp.gmail.com with ESMTPSA id 7sm3972445pft.84.2018.02.23.00.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 00:08:12 -0800 (PST) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: Date: Fri, 23 Feb 2018 16:08:09 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] ffmpeg_opt: fix max_error_rate help info display issue. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 5272bc77ec1834f767277f1cdf8ac13727a19319 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Fri, 23 Feb 2018 15:58:10 +0800 Subject: [PATCH] ffmpeg_opt: fix max_error_rate help info display issue. ffmpeg -h display "max_error_rate" option help information have been cut off, the root cause is used a wrong initial order. Signed-off-by: Jun Zhao --- fftools/ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 997d538381..1b591d9695 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3457,7 +3457,7 @@ const OptionDef options[] = { { "debug_ts", OPT_BOOL | OPT_EXPERT, { &debug_ts }, "print timestamp debugging info" }, { "max_error_rate", HAS_ARG | OPT_FLOAT, { &max_error_rate }, - "maximum error rate", "ratio of errors (0.0: no errors, 1.0: 100% errors) above which ffmpeg returns an error instead of success." }, + "ratio of errors (0.0: no errors, 1.0: 100% errors) above which ffmpeg returns an error instead of success.", "maximum error rate" }, { "discard", OPT_STRING | HAS_ARG | OPT_SPEC | OPT_INPUT, { .off = OFFSET(discard) }, "discard", "" },