From patchwork Mon Jan 4 00:28:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24781 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 D830844907C for ; Mon, 4 Jan 2021 02:29:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFEE768AAFB; Mon, 4 Jan 2021 02:29:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3B8468AA2B for ; Mon, 4 Jan 2021 02:29:02 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id c124so16816968wma.5 for ; Sun, 03 Jan 2021 16:29:02 -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=X74S/RmbXQJK6HHAH2RLHjvrzZqnoa/j73wRgD4fDfM=; b=MO5aNaDb3KBXFqP3Ip3CV0T56XmEwBngh7Xl87VufCaQJ6huKXwxP/ihR8nsHjV0vV gy8kZ6blEdCeoMM9nw8M+WwhPimkW1ZxuuBfsQdzcE39e4v1dJ6e6XF+11mkBasFTbYL L/P6ovgK+RVZ0AduiDmhMZx7S6yN451R6f+UwHSKYu6R/bKPGM6fUF2koas/0vjOa6Ko x7RlfodkXAdJZoo70BF7EsoKs3n6BdwKSELYcHWvjryykpHuFLyeRDY2MJkNyPweFp2V 9Jj5vcpmAzwgMx1yAy+9RBAvQun5GWAh9oJOvuM8bQujW+LK80/rUg4o+Bf7NEtluQcy wnbA== 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=X74S/RmbXQJK6HHAH2RLHjvrzZqnoa/j73wRgD4fDfM=; b=AvJOA2UTI5G29iZK8bNP+0rUDhRudHz0jvXwxIsbS1R53BSKgmDMle7DrxLBrVQ8IJ MVOgvPnKRfa2vLj0AsAjm/5qyDBtLLFKyO0SAgdmqi8AFWBsKhJEGTzv+f8rqEhcAmVm yE9C19MCquf2eS69EiGwC/sOADQyXve9jruSH/U83fBHZwyMVmAv7Uzbj3rvFjZ8asIS KVZDj/nUjyGc/UTSTUaE1T3TJJD/Qq42Ukfo1KmfCm/oYRn178UxzZILqDl0xRd9EBqG q4oY3NagjXezcYOUQtm7xpmqYta1pOiaDw47cIQ/aQiQX/2Fc7dVzCmrBqvQPnyKeryr +ecg== X-Gm-Message-State: AOAM531IPqNDj2LC8YVcLsei+hwKPOwMGF/RdLKev8DmJxSI96mM4TPI hEC9svl+LQ7b3zDG7J0dX3O7mXC/Llk= X-Google-Smtp-Source: ABdhPJzPDMjD7FJDdSoc+rARu+gNxnNz5TTqLLeZqTztma/d4+3SYkiBwHh2auJ4qxBKpa2jVhdTAg== X-Received: by 2002:a1c:64c4:: with SMTP id y187mr25135511wmb.165.1609720142101; Sun, 03 Jan 2021 16:29:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u26sm30032046wmm.24.2021.01.03.16.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 16:29:01 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jan 2021 01:28:16 +0100 Message-Id: <20210104002816.2321974-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210104002816.2321974-1-andreas.rheinhardt@gmail.com> References: <20210104002816.2321974-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/16] avfilter/vsrc_testsrc: Deduplicate options 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/vsrc_testsrc.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index cf9fa4b2b2..7001f9ba16 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -99,6 +99,9 @@ typedef struct TestSourceContext { #define COMMON_OPTIONS SIZE_OPTIONS COMMON_OPTIONS_NOSIZE +#define NOSIZE_OPTIONS_OFFSET 2 +/* Filters using COMMON_OPTIONS_NOSIZE also use the following options + * via &options[NOSIZE_OPTIONS_OFFSET]. So don't break it. */ static const AVOption options[] = { COMMON_OPTIONS { NULL } @@ -1653,11 +1656,7 @@ AVFilter ff_vsrc_smptehdbars = { #if CONFIG_ALLYUV_FILTER -static const AVOption allyuv_options[] = { - COMMON_OPTIONS_NOSIZE - { NULL } -}; - +#define allyuv_options &options[NOSIZE_OPTIONS_OFFSET] AVFILTER_DEFINE_CLASS(allyuv); static void allyuv_fill_picture(AVFilterContext *ctx, AVFrame *frame) @@ -1734,11 +1733,7 @@ AVFilter ff_vsrc_allyuv = { #if CONFIG_ALLRGB_FILTER -static const AVOption allrgb_options[] = { - COMMON_OPTIONS_NOSIZE - { NULL } -}; - +#define allrgb_options &options[NOSIZE_OPTIONS_OFFSET] AVFILTER_DEFINE_CLASS(allrgb); static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame)