From patchwork Thu Sep 10 23:49: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: 22272 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 638A344A710 for ; Fri, 11 Sep 2020 02:49:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E61268B9BA; Fri, 11 Sep 2020 02:49:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 789F568B821 for ; Fri, 11 Sep 2020 02:49:18 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id j2so9440648wrx.7 for ; Thu, 10 Sep 2020 16:49:18 -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=skjx759WTWlycURijklfs+Y+aK8Lp4ULaDkLPjBxsaw=; b=SJJkAtOE2jxXeyT4OfTK1kOpPTsjU5DZL7vg9rqdQfnhlD8+ylHLFqI7do+nQalGZC bJMbZQ0YWrneX35CPfuXoIsiGYfTcgxdG7C0J5z62D8nDxbkbjksN+AT8nDRofXF91p3 ffam/mmTj2OuZFCoNVh3lmXJGpvaseDyiGZwnM5nX6cd+rr5z/M1D/LlPlu6K5i2JTEP sCVOB/8o7TFjunphH2QH3kO/iy1a9nRR//WHN+DofJvMepXgcRpap60U3VZIRrrUMoew sK9lGl86NBz31rtz1TFwoKdYvZ7qaPm8p/7pY8Lj5ssmOBf5DUtbwUfIOXekBM5KysbP fvKw== 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=skjx759WTWlycURijklfs+Y+aK8Lp4ULaDkLPjBxsaw=; b=EmxqGa+fMAkAeiUc8moSAm3wV1LtnrGRj4noHKtg/ygeJD2Xt2nGl2HiuJ9Go/b0e8 RlqKCCnxKHGdia3Ds8l7n+Z45jXd/im99pG6pr4EvvEtTV9cNAA9Q9YqrBmfTn8ju0Fx UNXRwSkIu+WmE+T9wEoAKSs9k0r2AV/wnh87ftX03R1tdKaJKi+JTQRd06QDK3UchR/7 +b1tLJoYenO9WuVu8rcDDcUzIgD8VhOT6Y0n2nHOR0EZ31d9LgWXBs5WBwVTG5imZDES vapuON3x1XQYKV4d+fqw4tPDE5XmQEEbYtqdhbz/fq+fI9JVMbP7aHQbQWn2aUyzOfVm DY6g== X-Gm-Message-State: AOAM533A3qgIDjjr3EPOQH5Zfv86lQGcTzXle1HErx1x9WPp5V24up4d VudP0JrhyEgbec7TxSJ1cC4d6si4Ds4= X-Google-Smtp-Source: ABdhPJzHzSabj+cSm8SHNUBF5AKvaRjY/bnFMaV2/Iq1S9ujL6UZvkLr+AjBh3vi3rLtvhCxUuAhng== X-Received: by 2002:a5d:568d:: with SMTP id f13mr11067922wrv.303.1599781757530; Thu, 10 Sep 2020 16:49:17 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id j135sm586592wmj.20.2020.09.10.16.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 16:49:16 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Sep 2020 01:49:09 +0200 Message-Id: <20200910234911.12891-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/formats: Don't typedef structure a second time 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" Before commit 2f76476549a01ae2c4ec2a440e4b14c5aba64869, avfilter.h contained no typedef for AVFilterChannelLayouts; all references to it were done using its struct tag. formats.h meanwhile contained the definition of the struct and a typedef for it. Said commit now added a typedef in avfilter.h, too, bringing it in line with AVFilterFormats; yet this means that there are two typedefs for AVFilterChannelLayouts (in contrast to AVFilterFormats which is only typedef'ed in avfilter.h). The problem is that older versions of GCC don't like this and error out: http://fate.ffmpeg.org/history.cgi?slot=x86_64-openbsd5.6-gcc4.2-conf2 is one of the FATE boxes that now fail to compile. So just remove the typedef in formats.h. Signed-off-by: Andreas Rheinhardt --- libavfilter/formats.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 8378be4b9b..0520bf42a9 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -83,7 +83,7 @@ struct AVFilterFormats { * channel count with unknown disposition with the same number of channels * (e.g. AV_CH_LAYOUT_STEREO and FF_COUNT2LAYOUT(2). */ -typedef struct AVFilterChannelLayouts { +struct AVFilterChannelLayouts { uint64_t *channel_layouts; ///< list of channel layouts int nb_channel_layouts; ///< number of channel layouts char all_layouts; ///< accept any known channel layout @@ -91,7 +91,7 @@ typedef struct AVFilterChannelLayouts { unsigned refcount; ///< number of references to this list struct AVFilterChannelLayouts ***refs; ///< references to this list -} AVFilterChannelLayouts; +}; /** * Encode a channel count as a channel layout.