From patchwork Sun Aug 28 21:19:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37523 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1584417pzh; Sun, 28 Aug 2022 14:20:23 -0700 (PDT) X-Google-Smtp-Source: AA6agR530rOJnvqq2MGo50DNnWGTtsemhMxy2e+4ZZSN6v03Ji2WrBGEbUfhpb/7w7vSgelJrSrb X-Received: by 2002:a17:907:8692:b0:730:b0d3:5311 with SMTP id qa18-20020a170907869200b00730b0d35311mr11922074ejc.674.1661721623111; Sun, 28 Aug 2022 14:20:23 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10-20020aa7d34a000000b00447fb63e27dsi4250316edr.348.2022.08.28.14.20.22; Sun, 28 Aug 2022 14:20:23 -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=@outlook.com header.s=selector1 header.b=GDK1VCxW; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18D3768B603; Mon, 29 Aug 2022 00:20:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4832068B603 for ; Mon, 29 Aug 2022 00:20:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hGi4Hj4y3HbTSuEmSyHw20ISZFw8ue7VYN72z9JQZzsS2+ViP/ztscLg78EQvAUq0le7lxw8zu2FpFLzsjpR69UWEjuV/r9YhTYac+h7Mx1S/ehXc+9hQFYdgAGegaHoDIhUi2GTdZO4YGielMb03YfFCPrsDUQUZV+5Y9nN1vvL9UTLrWEmUzpTtSKIwzleYlsS6Fa7pqFUxJ2fvYTcnifsEP4FnWFJB2vC8qgVTY2htcWgmA5qiMiWdC6Qrha0qAYNQ1sEaLqqFmvHBzu5hG9UeJSPaFyQLeBmv26dFozBRmWWdaepJkeN7tyzZkwV938AvDkLOEn5RfUqOJIGlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kWFNVFSzg8cSDN1RDHgQH3TAq6pXiVK+BiyCR61S9y8=; b=X/JMJO/9w+Ggr9Pg+yZs61ahESAgTjsoG1ua3L9njVnxkIn1hQRJYXw0Q89HEBJqdJtUIiOWSpJxqWuCoHo2OpequP9hNRcNIJyDUzaJqR2x685ZKNlEXuGFwykgzjz/jKZ0kw+1MeWxmVlFA3gLniMDGLn+BpS4fYUeHgslyPPkf6Ov5SRIYBiwCobPrUVcdHHawBGOKgs4XdlYulvlicg7JK4ZSJHS6/Jhu+qs7b2/8gdl9R7s1JdfzDvWYby8JOZwpFVy503Zehj2ZSQgr9ivTpJlXUqJksRvsufjARKzZowRX8VaLOXCwMLZatDdKAD5ZV/EWj+B35urLLLH4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kWFNVFSzg8cSDN1RDHgQH3TAq6pXiVK+BiyCR61S9y8=; b=GDK1VCxWJs7I2veq1bdjxISuM3L1cSZkparHCbL7sqB9KX2Y50RudcKCito0sADJei9wm89NEZUBhGRSxNjsT4rI0FQ5+UM6G+ZFYWSY3V1jrkATB6wAEzfbf0h0hEFwvS9HbHbQlf0/w+4EHRHQBuChggAywUTCmXTL/vdekSaIuXUpwbDfxcgYlShhbxGLtoGIeprfEgwC5s/v9Bg5Dsjnm8JBb0FRQE21eMrsw2u+f43yHU+kIDLxIj5S11xfwDy3qayOX0nmR5htyXbP2jj09XnZqG/opOLHMJUM/uwRBO/VWgMgAU2aoQOeXaCBd2v17YVPrXSmF7s+cT7ycw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Sun, 28 Aug 2022 21:20:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee%9]) with mapi id 15.20.5566.021; Sun, 28 Aug 2022 21:20:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 23:19:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4B4c82MHbJ1T7u885UglKLQFdE/qmY/d] X-ClientProxiedBy: AS9PR06CA0114.eurprd06.prod.outlook.com (2603:10a6:20b:465::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220828211957.472263-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eafa89a9-5f18-4f8e-47b3-08da893b1326 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOd3gYJN0/4wUYoAohlvVRnTEgdK2Hi9sbTVRY1qYPYQipG6rxMt2flPDIDqr51HvwH8xPyNqpnv0EFxGgUcTybEiqUZ1Bgnm54Wd1Nl6THmqVYjYt6F/pyX7cGf15UPc+g1ZYZpuBzYpHP/65QTOR10JwfX/ZHoXPC5a4FjSm08bEeAmScjef5EQCxcJgZfFXwne7BEYtrYozJY3AG0vd8fVgEm/2pUGeRvJnmY6I6btoH4dAxyPHqxJTA8Pa1sTAhgdqD1y9/mJQVYI2yv5xLsqA+OZVvRPmqk2nqfkBwA74UxP+SiDMs26g2fKNV6DUeQ/urtDFw+GKOMLNLF8/XxBKV5dfwtL90V4sliK+cHQbfva28tYVrTF1llgNzN8MN9qA8qLoVyCSBfRSd93y55G+UQccLkEGdRHaxZHbRGPZ8mFMCczLo5KFB6aR0I35Xt+PNx+TZzaBk7nchvoflHs+ytKZiE4xQTMH936g8C9cFXyhK9nPwzv66+CyPdHGHGa/OLsqjJ4A6YtZOsfSvNmUjV2gMGCb4zmoXNBChVZjcF2J73Ommct7xrBYhI1iZ49w1bQb+Rr0j9JWXphbaPAfqpjoUCNJscaDsUIpA3rJgFqp2wiihsd75B1KJGYYyjBjJmz4VUOeiU/skdGAis3S1t+io7L4FCwadcpLTybkCJJ5OkjSdsshLmwceTXnH/Pshe6OU9MRbCQWdkFQu2e/c9c9+NdRVQCYpkjfhSGw= X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /zAE0cqZjpIqIiQXXX1aH422L+d2dBVeA+D+x8kprffrnOUg0zvr0YeXoWs3yGwmvlmjhERdnnS7dMn1cKAl3Fcmk+1fArU4SdaREBIwOPFQfFxRVd838nz/Y+2aK62rXH2YX7IOs5A0HOq6DE/+M6ooJye+q+NlDzXLzsL8F4i74tZ1b8DfKbege1B4CdK5rPnxA+EcuCgs0XCfl0fOD77NVOSOvZQ8W5O7d84dXd/lqaPT1IK9nejFUA1saIGoKLqoFT1Ns860gTp7GEC1LfDm9mazBLqkdsiW6LHqssNNef7q1R8/s6Lga5ZYSXh356GVVHbMjK/G6LrQLTjr44S40AApi9SHJqFvw8UZaPdSRP3d3MPRPCA2VzX2cnzygxmJFwG53OK5w7iKRaxYou31iwRktG/JwdmBLC5L8xpgAEofsgpA7iHTjwfMIavhKUYAvwNRtJm30CVdRT5M5UGBp9wSPwgoTexUheI+MMsurrOQkSw6uBbDV2NE7HrSIvW/tEaLG8dTchaBAfsjNamEHse9FS7dHvCjUKx1EgNnJcd/OAzWvZW353N4NKKWX8XQ8k9/Qx0SWdD6Ku4dgYHNgZ4AF906C5h6kezSWdsfOpdbG/56ckE0fWVxa5lkh7DCs/jm0tXk/d6QWWz3jA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WOMKXviL44XZONtEtfM9R19xmGQrhbMl8xHHCHVmALQc8GSIieeduw8/g8UnfPoZkMQZEErwwuAcQPhJJ5IdG+c7b8VkmavzhXLwQN55qPTFTO/MQV86WnpvCHhvC4Rd3J88EzXh0pwbeY3nL0ae/54ddiakXkEiQSOb6H+SGSEFYoq4Wlexv4nKTDrEUfutY1oaSGPUWIpztwHazXskbhYw0JPtziH70sCCZUDPkuAIHbTReMufWHFgofRBZU4hvm9wDNG28owh/qv+KEGWDIpgXy/TKSqB4U/5Uhoj76+xLYidMm27g7uzmH7OnrMxns75KqYRx/efRKdu1j6RVnuZyy8D3PrrEV7t0Naxeh1B2SwssIbklZZuRzODExqhdQTWWKyQSYF0blsUyuNPJDB+XwM1ribKzth6ZElaQ15Ic1kkfxej/LAR4gbi8oorLvfoPq06PPQUz8eRssiVmPme4WkbrbKKK2G0yBXvQWhXYXHEUtZhFX8vEnaN89Ry1AnacJPdgZuuEnXvVdkCodpKEqxV/ZQYjPkz5gBlXdiXgZDJ+lgef3b9+8xDucYivFWGI6zmcGF6lPf8GplrmliyKho29yJjFEEu8DKwdWDjXXGHuye2MpxKrBX4YBllwOpoqA/HZ9ZouqknAUgK7xU3/S87qeMELYREefcDz7LFySUxE87v15yG40cMEypu596urk4WquM6qBv4gFxaCMnmG7IaohsqtqcAnWOO+BMzrFMvTAjxyjqvlblxvWAVXltg+jQjE86s2K6VvtkX4/UrROWXLZw55ME6EC3Rb/M5gJrVyHsY2S4+3Yxd2/9me2SYAMaaQ2gyxzvsnUxXn1uuIhxm0cd0+TUL7na9ziahNwtHG3p0lBFT58nQJXK9GAe7dy7grD7RhQLpqYBfz5zOkavmhjCxJGOE0K9kZ0vU6/vCwjkNVM3k4rbZnJVSMFUlnYSiLQDk4SY7wtvbD123rJ2tjfrHAfpLEbpL1ksSGzCTtcYkxQUoTWVRA2GUUgb58PKlcg8ee0jq3PwxJbbgoeIM1xeKQVjYGT4o7O+UMdBBTsuZJ43acuqCqoL9bGJ4CKBPRMwXE0b9HiNuhrirtyJlKxW5NXrIwHSEkVmpuVnDWyVBUUGXSG93w/DDOf0kllPTpReZuCvsDnypLjyOlSUr0nITLU3rtR3fzJ+MMAEPjb2sh6bmuM24S+EblyrkrQ3GKKnZfHnXXDcqIjibeHxZLwpwpXgqqRBRjSZZ5ElwbbR2kBkTM2O99EQ4SGAgKLgLTj8HBt8TztNVfQ07r2PjY6nA5acgIJpTkWE= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eafa89a9-5f18-4f8e-47b3-08da893b1326 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 21:20:04.5416 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P250MB0747 Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/flac: Remove unnecessary FLACSTREAMINFO define 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: l/ylwBh3x8eV Possible since 38f5a266eed1160e87da8e832a0a07818d7673cb. Signed-off-by: Andreas Rheinhardt --- libavcodec/flac.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/flac.h b/libavcodec/flac.h index cb220ab4c0..315df492a3 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -69,14 +69,11 @@ enum FLACExtradataFormat { * Data needed from the Streaminfo header for use by the raw FLAC demuxer * and/or the FLAC decoder. */ -#define FLACSTREAMINFO \ - FLACCOMMONINFO \ - int max_blocksize; /**< maximum block size, in samples */\ - int max_framesize; /**< maximum frame size, in bytes */\ - int64_t samples; /**< total number of samples */\ - typedef struct FLACStreaminfo { - FLACSTREAMINFO + FLACCOMMONINFO + int max_blocksize; /**< maximum block size, in samples */ + int max_framesize; /**< maximum frame size, in bytes */ + int64_t samples; /**< total number of samples */ } FLACStreaminfo; typedef struct FLACFrameInfo {