From patchwork Sat Apr 9 20:18:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 35242 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp278848pzh; Sat, 9 Apr 2022 13:18:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdee5GZyUh30URhHwk5Gct3hbrt5l36TiG/6VZrTaU/csd1zcqomZL3DbTxj/XVcGm4Rtu X-Received: by 2002:a17:907:728e:b0:6e0:5ce7:d7c7 with SMTP id dt14-20020a170907728e00b006e05ce7d7c7mr23881596ejc.113.1649535532001; Sat, 09 Apr 2022 13:18:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649535531; cv=none; d=google.com; s=arc-20160816; b=A6KIbukZBVg0t/90q/hPwzEa6yWE/fgp7nUSRosi90NEREC9uNEXJPoTdHmUabY0NI Mln9ahG81V86Yi5sT4UvIwVvqHfKkJXKzz8u3gD8EB2ys1GHZOUgD+w+6zT745dq6TOa Y58nfV0moqlPMLSJ1/jJ0ILtSSTkNFtzG3xSvXMp3BPfvuM7XkbuT2ADAEIRhk6/Bv8u ajOOW8i3CLsLXcEW70t7tslzmpqtgpLr+X9iHiHWlRTREJ0ePT61PB2G1weOfsD7aSKN tiIExCmZhkYsxF6qDXIbUkZoUtc9mPyR/dpmOHg1AP/+4p/anokso2dYa20W2LKmlcf2 UA1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=k8Un15fbzkljp2sjpYpN3tBH4bBWNU67UhzMdOlxV2Q=; b=oDPRTuQcNZoS+BEJ6ia2i6+vU1E/BALWKvMe2NxXzgbe/9Eaz262Kcf/DulKLNZ8K+ QUNvqjRnYKiABUispH1lA/zDMIR+ySz8mJXm0Fc2fVnEacT0le1vnWy0Mamq0bokE806 UWBhzdK0nn2Yz8XVjWRVq4krlFSxr2vzsZS3y4m1cGcStQp88Elq47jSbhPqTTOnix4V buhLUR5zaJH090SzVWx8Ft8suYKPJMvB7pxAhN2D2R7VcQjhJugKjG/tEf0UF0AsESPN WgUfRaC2J7Vq4shInLO3GUc6V82YXLWr27bhTPi1OJyelOlDdFjuIbGzLCL86SbNJAcH ag3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nckbgVLc; 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 y23-20020a170906471700b006df79c7ada7si3889068ejq.179.2022.04.09.13.18.51; Sat, 09 Apr 2022 13:18:51 -0700 (PDT) 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=20210112 header.b=nckbgVLc; 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 64DBC68B2FF; Sat, 9 Apr 2022 23:18:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A2B168B0B4 for ; Sat, 9 Apr 2022 23:18:40 +0300 (EEST) Received: by mail-oi1-f181.google.com with SMTP id b188so12169417oia.13 for ; Sat, 09 Apr 2022 13:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=HUbtmlaQRF1pOr+sxZGaoitBkyPXncwz012StNGiBsY=; b=nckbgVLcTazxkdUj8+KAlovgcPhOrZCUq/h3Fd1gH7g0vnexYhz+xPAQPkKdqUC9wI 5Ko/DAy4XA6Jykrn1p3g9EZOqgm6KIdHmBdpizvT4nfJ7HjJpkW+CDZqcdH2U1Ill6Dk 45M/jLJrYagP49uXMuQ6gEzKQ6TkerBlqtKpKkbo8dZ29SlVmFJU5YNy1heWQOZN6Aen KjlR1AiYBLaI4fcjqiPziCTTFSnykxfIWuBdhtjAYr5ONnbI18PqC0Xqwi76aiGlNTYQ DndoE3p3JgMMNee9PiQmRzOpjUO6yC/wGddIYMHJbg9tXt7l95ycoOWrUx9gk0P7m9ZR UyfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=HUbtmlaQRF1pOr+sxZGaoitBkyPXncwz012StNGiBsY=; b=qaf5GA5vQiXxc36i7/evNVB3XnWF08THeWmt1vVgt13s5CMvhpceByzc57r50vMzar ntQE8cjLMs098D5+VWi5bWCqJi0pL2dBCe+uQbxGWGRskQunfDkBoOYUOFPbIMGR5Bd9 VdIJKN++NMXs8PdlVFkPzJLbAS4XVZ+U3NRbaK9Y4XOxoOiarYIwN2oewmt8on40IOyg k95bqlZMIbGbV4Xickoku9HAdEYBrsdEhVr2idL0cEiXSn9LLw27E+udFU5Gk2rIp8gp QVd3Ozdzxrel81wrEsGbD4cpOJ+slbEYUyXVhKhR4UB/hJo1nqtYrjbHjZDhf9U17Lf4 bTWQ== X-Gm-Message-State: AOAM530dZ0rQhRMVegdtWVtzynKV4sYF3UjtXDP+U8ZkpPpisWB6Jlxt qmEfbbnoplkxTguLSfynhGi+z5TNrJ8= X-Received: by 2002:aca:180b:0:b0:2f7:23ae:8cd1 with SMTP id h11-20020aca180b000000b002f723ae8cd1mr2379677oih.146.1649535518684; Sat, 09 Apr 2022 13:18:38 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id z10-20020a0568301daa00b005ce0f36dd81sm10383933oti.12.2022.04.09.13.18.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 13:18:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Apr 2022 17:18:13 -0300 Message-Id: <20220409201813.8481-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_drawbox: remove redefinition of DrawBoxContext typedef X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 4R2S8rZVZjv1 Old GCC and Clang apparently don't like it. Signed-off-by: James Almer --- Untested since i don't have old compilers. See http://fate.ffmpeg.org/report.cgi?time=20220409194302&slot=x86_64-netbsd-clang-noopt http://fate.ffmpeg.org/report.cgi?time=20220409194413&slot=x86_64-netbsd-gcc34 http://fate.ffmpeg.org/report.cgi?time=20220409200245&slot=x86_64-openbsd5.6-gcc4.2-conf2 http://fate.ffmpeg.org/report.cgi?time=20220409040143&slot=armel5tej-qemu-debian-gcc4.4 Clang 3 even says "redefinition of typedef 'DrawBoxContext' is invalid in C", but newer Clang compiles it fine. libavfilter/vf_drawbox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index a4fe0b8abd..65bd039d65 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -73,9 +73,9 @@ enum var_name { VARS_NB }; -typedef struct DrawBoxContext DrawBoxContext; +struct DrawBoxContext; -typedef int (*PixelBelongsToRegion)(DrawBoxContext *s, int x, int y); +typedef int (*PixelBelongsToRegion)(struct DrawBoxContext *s, int x, int y); typedef struct DrawBoxContext { const AVClass *class; @@ -96,7 +96,7 @@ typedef struct DrawBoxContext { int step; enum AVFrameSideDataType box_source; - void (*draw_region)(AVFrame *frame, DrawBoxContext *ctx, int left, int top, int right, int down, + void (*draw_region)(AVFrame *frame, struct DrawBoxContext *ctx, int left, int top, int right, int down, PixelBelongsToRegion pixel_belongs_to_region); } DrawBoxContext;