From patchwork Tue Aug 25 14:09:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21906 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4FE8D44B55B for ; Tue, 25 Aug 2020 17:09:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25469688379; Tue, 25 Aug 2020 17:09:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DB0E68827C for ; Tue, 25 Aug 2020 17:09:41 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id a26so16750247ejc.2 for ; Tue, 25 Aug 2020 07:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J+IINYaHjIeSZI3V2/U0kjHjwqziLB/nkv/musfg4VQ=; b=aglEUIsbuAhef5EcsVaYjVDcpko3lp6pr1w55KGa4XcJIXvIRi+h8co20yqV3PRxKh vzoyOFPXjn9rAqGLYGTXWG/6pRYYBZBEthvQUHEW1sRaZxp7RDqXIY77Vo+0yLaQXsW1 1PnbcX1m5M4UEfZCDHbpRtyDBJhD5/Ht7OGiNvWcm8GT0/uI9a7Xopw30DV1HvYYz9Gr lVlRpLLfjCxCxVZSXPWG05QD9bGP1S+flwTz4//mfWT6nicqExIcwSwLDl2BZRbfWsYv vl7PjB4lvg+VGUFUrqdKUxM5B7/RhOy6m7arKPoWSNCIFSrOc6xPPlKPW6ZIkBG1ijbP rPjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J+IINYaHjIeSZI3V2/U0kjHjwqziLB/nkv/musfg4VQ=; b=if1OPOr80ipW5Rk+/bcBIwcTu0+s2UfD1mUTxf8hOs1SwJ6NSDrzRkgKx52rsR4edj JScI2ylE4Ju6Y5ExJ2ih4CHPJdTcSXWY6ehAt+MsiSJ5D0nNvwqamfx1xDuixty87qno 1Ac9RMPEzs2YtP1GTwi8VbLd8yd9f5QvWP4Ncf7x1AoetDxyzKt+Vac4xzhQx3DEU7Y4 AA0dD5F9Am8Y3Xt+jFvl5HQBtWGso9wvlXDeIb+2qtOzA0NXD2KxgUMotKy4+f4SdBrV uMenRgD4q8uPFEqrg8rpCEaYeOnJgdXKWCAmPmlbWy7/hPW2ti0L+IRrQN2K467j6EdK wQ1A== X-Gm-Message-State: AOAM530pxZv2jIyLIvpcF9DjOHSTXQi0/6mifwNWb7uBYLZNloRndY8c tl+6oynB2bjGD2Ywu8vtKG2B/KP7vv8= X-Google-Smtp-Source: ABdhPJwVST5I4STV00eS7Adm3ErPLKAPSkOgSr8v48Pl0wWBchsv44FYLsE3SmCy+cfGynrIYUx2mA== X-Received: by 2002:a17:906:38c7:: with SMTP id r7mr11058589ejd.118.1598364580674; Tue, 25 Aug 2020 07:09:40 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id k25sm10169806edx.96.2020.08.25.07.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:09:39 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 16:09:09 +0200 Message-Id: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/19] avfilter/avfilter: Fix indentation 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Forgotten after fdd93eabfb2644f541f7aac9943abce26776ea73. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index dd8074e462..cf3b4e461d 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -857,17 +857,17 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, return ret; } } else { - av_dict_set(options, key, value, 0); - if ((ret = av_opt_set(ctx->priv, key, value, AV_OPT_SEARCH_CHILDREN)) < 0) { - if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { - if (ret == AVERROR_OPTION_NOT_FOUND) - av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); - av_free(value); - av_free(parsed_key); - return ret; + av_dict_set(options, key, value, 0); + if ((ret = av_opt_set(ctx->priv, key, value, AV_OPT_SEARCH_CHILDREN)) < 0) { + if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { + if (ret == AVERROR_OPTION_NOT_FOUND) + av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); + av_free(value); + av_free(parsed_key); + return ret; + } } } - } av_free(value); av_free(parsed_key);