From patchwork Wed Dec 30 23:31:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24694 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 769D844A7BE for ; Thu, 31 Dec 2020 01:32:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 615FD68A758; Thu, 31 Dec 2020 01:32:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FCA768A5D3 for ; Thu, 31 Dec 2020 01:32:36 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id j16so16838087edr.0 for ; Wed, 30 Dec 2020 15:32:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=9VsheJnAfdpWJ/eQWo2DC3T+QlEfeeAymkmfQywy8nk=; b=n4NuH7TW5IRa0oOFcgFVozBx0bDeUymEtI+szK0vhQs4JUGB5bgBvxwgn/pxt1xFPI 6E8vUHXCsAB8xgSi/gCJ0eANGoqSG1f1dq4XVBG7CC02grc7fB0YXNFd9qC/DhHcm4VD xcg1KBAYwfTjvy7pG1YwaBFYpxiUjmgNizxyryNeIJzVW3S98cPBiFeixqIPD834QrJc fyfotB8GtGhTwYRkxmrIu3JFRv9ZFoZR1Vp7G1xq6Iyp4/3qtnas0wj1YwDXv1a7jC3M jAfxBcbr/ANoyAuRsnfuQrsxVovtkVitKe+NGx4S1yXQndd/REcVOTAQ+p9InXVR0oXZ NY6A== 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:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=9VsheJnAfdpWJ/eQWo2DC3T+QlEfeeAymkmfQywy8nk=; b=g4FK3LEhqGqnrsRhZJMq3xnRtnG5n4f8slKLFBXPUXTDQ79/RvG3qisCBm+eUALCQG sLpwN18CMy2TrNhywpsgueUCN+vmcOFo/8+Jlsfi9Be9lEQYmpY7mcPpxxFR/nzunwyo CWO+OEbVNQEQLaqzN0g0SsjF+by+SvJuSNcr6UZJmyCyXBbTaDsC4uaOAmwt4dE0WB36 8woZRHu5WzGNoqKC5LVnT7/k+sniW9QiLeTFF8giZ4xxl9V5VnbYeMBzSMBA0kz/gjpG xc3WgL/3OxTleFxA7Xxb1HnKNDMX6xhdz9eGihGAvyAF5/367aRKLt+xc3j4mjR+8lNU 2zRw== X-Gm-Message-State: AOAM532oEpCjgcnBpwd5hGcICBkRs+5WxJJ2dqtANh2NKns29R0MGq/s 4LZaDRZ3ia03tPYm1FOWkBYPq4x8eaA= X-Google-Smtp-Source: ABdhPJy3riDGml8Abj4kpIvAGKfc5lVSduIqx3ILxCRKODgDI/GTRwoONYW5yTsLhnueTgFmsN7RZg== X-Received: by 2002:a50:b5c5:: with SMTP id a63mr52306767ede.227.1609371155689; Wed, 30 Dec 2020 15:32:35 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:35 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:29 +0100 Message-Id: <20201230233157.1055287-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/30] avfilter/vf_addroi: Use chars instead of strings for one-char strings 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" Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_addroi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_addroi.c b/libavfilter/vf_addroi.c index 489998ce73..d6b83ee854 100644 --- a/libavfilter/vf_addroi.c +++ b/libavfilter/vf_addroi.c @@ -26,8 +26,8 @@ enum { X, Y, W, H, NB_PARAMS, }; -static const char *addroi_param_names[] = { - "x", "y", "w", "h", +static const char addroi_param_names[] = { + 'x', 'y', 'w', 'h', }; enum { @@ -74,12 +74,12 @@ static int addroi_config_input(AVFilterLink *inlink) val = av_expr_eval(ctx->region_expr[i], vars, NULL); if (val < 0.0) { - av_log(avctx, AV_LOG_WARNING, "Calculated value %g for %s is " + av_log(avctx, AV_LOG_WARNING, "Calculated value %g for %c is " "less than zero - using zero instead.\n", val, addroi_param_names[i]); val = 0.0; } else if (val > max_value) { - av_log(avctx, AV_LOG_WARNING, "Calculated value %g for %s is " + av_log(avctx, AV_LOG_WARNING, "Calculated value %g for %c is " "greater than maximum allowed value %d - " "using %d instead.\n", val, addroi_param_names[i], max_value, max_value); @@ -194,7 +194,7 @@ static av_cold int addroi_init(AVFilterContext *avctx) 0, avctx); if (err < 0) { av_log(ctx, AV_LOG_ERROR, - "Error parsing %s expression '%s'.\n", + "Error parsing %c expression '%s'.\n", addroi_param_names[i], ctx->region_str[i]); return err; }