From patchwork Sun Aug 28 21:19:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37527 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1584677pzh; Sun, 28 Aug 2022 14:21:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR6BP+K5+C2tyymM7xB8ONd9eXLMNnuiuo8Bq0LFsdWkUhGD2mTjCc+XSXEy+sy0tCHt5EA6 X-Received: by 2002:a17:907:7283:b0:731:60a5:5fc9 with SMTP id dt3-20020a170907728300b0073160a55fc9mr11399176ejc.51.1661721659819; Sun, 28 Aug 2022 14:20:59 -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 sb14-20020a1709076d8e00b007315809ec88si5596086ejc.399.2022.08.28.14.20.59; Sun, 28 Aug 2022 14:20:59 -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=tyZpNyWt; 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 B0BB668BA2E; Mon, 29 Aug 2022 00:20:29 +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 D951668B9BD for ; Mon, 29 Aug 2022 00:20:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kz3kpmQbWeFTjS9yJmIcZQSnYM1e7ofja68StIvIBDh4QyNtAksZlSbeNk0pBpTvNd5E7J8FDm7hqzcmkILBdEoG5y6sPlwzlpK/h8w326C/BTTg+rAglO08lqMm7CURM1eyJ07pqydYt5kn1Dy8mAb58fS2NJ9hZ9h7Yji943RAbxImy5uQJTgCJoVY3bIQL7RoTAHyviJdNy6x/8H3u3fT1Hy37EGvTU4B9Wr7n4lhMWnvyzvvCp6n40nVeYW17O38ctUQ8KixyLxqATDh25Ie9z9jPypfRnOrXD5FMzysBmm/M3AqzV9heQoPkNtBDTLk+IU7Z30+XFcAXNnZhg== 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=ds6kL5snDEqt1JzCcTxONpjxXo9rG//QYnmA52BiITM=; b=Hgl+JcmNE0459CDPXRTmt/CckJhaPbs32ZBW0JMJXkwBJw+dqg/abDbxMWg0VK3S9oJfFPD8YFqRjHGXdRjd7DH28ik00GqlfYMruGdh/9TSGRNLD41fOOUbI+b6+7GO1B2iSBrU02iVIQj1ubr0ibEggMNfsta66tZTtKEzkd2ovh5PaKzLPmVPeiGFt/zkV2aOVTS+JO5BVNdUo+e7lg2cFI8c/vfLm+LrYZQsSh5W9CwbCzft1nvE+Nynxtl8MVfmWWH6Zy86tS69+WzB2duO8S6r8HCPUETPjBpABZKbfxdjGQT7ygNs7VRR7Ys2t8n00xNefyl+QsaDvWHqDA== 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=ds6kL5snDEqt1JzCcTxONpjxXo9rG//QYnmA52BiITM=; b=tyZpNyWt0zK9aqQzYI4m0Cj2iZSYddNVeJ77CfZPvy06tFFf0tdlB/nDs5uDJCZkcSlZ9+v0xxvhpTZoMYa1oZNXDLhUFbC7gooqQ2XmGqACdCfn0wUJwBaq4qm537FKAeJywz27fFrcoNssP2F+BVvzFdJF+ZORaLc+6K96CuLAcmLOTWobsBCwbiFCOLIOG5TpMKvKHoeCV5B89E4o+N32GdRM/Z2cVr+DsFzko5ZBs0ygPSDjUsrOT7iG9uuNhw8bF7jg6/oAzL2PjhkxCvFaUEo5z4q9Vo/s4F4LvUn04A6Qcn2ZMyNoJCsUexyxwccxhBKUCsfvbCKcTCtEiw== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 23:19:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DueQJ5OX7XORSZi+zHAWfvgdaIRsInkz] 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-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 590304a0-6405-41a0-ffe2-08da893b1ba9 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKySlSM5rOKlGk6W0etq9ZOJAsn2Z8pRuMFyzAa6Fr/qG/BtejUEfyLeEQM9ELJ01mkO7df1f+YGO3CRWwIu3TYWsEnPJj1iwr6s+CqIxZnBBKB36njSS8tjNxokiMy8/YfVC7ObvI7FXvWrGF4jvOJooRR7xizIptAU2+GawuVG0HK+TsoYCorVyV30PFffi7KpuFXdH/xJQB9QuFYWkhOIjpKjf1k0cUgOjDJJ92mwZmGDQzJU3XcPkRW1exA6P/wqpCymeabxumdNpaYdM2rgRGyyCq4+5400robbffW2kUSb7S3boJqXRhEQAgt8q690gxfacjGWjHJmsBJOwANtrAbmGmn3gDTPWS2yYkhvzg0J8SckHV+6CouuR1wq0OkqmGijnyusdKTPFolx6X16VxIhjCXVfOrjsDu9Gq/PP6tfmvxPSJLgXkU+FH5zJmT76fKhjAnUDRH+1WjayBryFLBrD1NV2FQc1Rx+x8HxE9JNtqnW3C7bWuz7QoY3jYRdm7C1b9FmVrL8iHqhYjRk5iHm/MTfwUGZY64OXTY0oUIDZADGdBPiqXGrl7X01amEfo5fz0DCAPnS0Ps5+NjsooQfROzmpNAdrCT/SnwFRxKsZg+hxzJmoGtkv5Mwk7vlcYP7Q380BBN6oOo6PnTAMJNyYMjtTZ7fFFHkJg5U3tD/8tK7Jom+OfB43DUaHhOa5EnFN63lwfMYOOKqHEUU+AhAYgfEMTc= X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AZu1fxIv1WntZMw+W9g9ObQIajdfOSMHMo56YZBQoAi2dfhihDVgjZ10jVYhsRDRzZs2V5meh9MSz8a0FI+fiIM8nHR+Uv3ZTzAB1kPQi2njPvJfBw9Xso3+TrX8e7PQjShgbxew1+URqU3JaT6EWvHjc3KVbpLhFqRjR+wk4CgOI6/RPYOJCVyHJPFEaGgqS/Z3Z5Wntbd9273z/uutOLs89Egrczfw8oPHZfq2ZbefD7f8BNIgqFu34mGos+YUkfkHqRsLkV5ZhDbQ0LMsvJHhd/3DxgrVcUSvjke30anoZERmptrjHxxXgZ+av+USpCXLKcCcHxDPIsu4QRibLjw8JMidvMwQzLI6RgJcVB0Qh/gMc879aJhErP90MnJpMTQbMX8oLrSx8z5Z5X0gkIRE2ndMOhWYLWqNavOjeI9BAresGqYwHa2+U9i2enFPQ3IIzrxreGEPsGfRd0CBPMd66EinC8k1ni5kM0RDG+ufShSQdAEPL33p7W0ND2C7SYBbDgVPW8UJmOzKs2HFoS4zYZJIIwCMFxWzMcOY4yORAdfz5mQnMawbiz7JR1n8RSosC4VeKGmAQTG/ZEZhRjg6aPIT9YmqfA+6cPRfPCxfNuFIdKRJJkWMqMMBpXEQIHpVqWSAgkXYKg1TETDDvA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y5Krdii5EjGDW8MEVoIKXg4W7kpSQormaieQGSGbVYXgyq4kvobtSCKncG1+G74pa7hVjkbIYACqdc2Uy5OrzbdMrs5IJOV8cGtfaA8X4ydIOxTUP8RdAr0mcdYUmb09S98HZUbZpvRskHeTq/4RNodMc0QEkHiMaQzHlURtPIU58YGlimHfg66OOfs3hJC5FbOSFw83zMvnRivUgbaep0Gp+VGZ2i00/acs4RIAR+IgNhC8JAwbd/BJsvnZYcMHa2AvGxrDHmBOKN1tS19CHo33Wdk39kn+1qrtxaUqMHyu9O7DYuiJJhbUIKcfgOxKtgWJJhFOFmlwFoGjSR+foWUbSI6Z832TfE4vhTI+RutsnCTV+VhsJ6ISgKbr48bkr9DeEnyahntIBv/dfecXMbUsgqe29/uAixDc4LyN9GiXvDlyX0LzHnij3wy93sI577idN7V4p5UDXGrAPw31qxjalJVPLVRFca9qMWVWcXxKK1Cmgioted06kWsOxEKnoXznYvhkA+kiokgZeXIdKqPN9Hrjtrt2b2/xiKTmwYqNx5Uh1DVR5inSgUK3vdwLOdYQWcrAyrD3yinhllbhvS5OfmD9lEgjfdwKgbxcinX8evZI8jb57HMjhctjfNFofNhXBdUKRCJ6aYlRLVFXrqZweXFULuxiw3Rob+4vUvFxJOuxSjB1WtCQbteyenhPQhTgL7lVi4Rg4qgDYIKZVle00p5vQFrjr6tIeh6H14fEFOTXIDomrnsQAKam6A01SsimihnLSZ6KdTKFJvtgQtmket9/Wh903azaPPkOhy/GiLcKUPwX+1C759dO50A7Wuq+hUilSNeX4bJcWFRW8lyyleweJTFr+rrFrfKTpEhI9bqLd84jR9AG/jtmFfB0LbB3Gz8UZkmuqbXdPZ8SY/KGEy+3NGCUa3pqYnpt0QEuXM/gH8x/+DWL20VS4BGvGdKXoQLaNUbgo0OBnGpVr8/j/fgKMhRQJezhz7DcYNwPwrKpBWjm1PB4K2pB5g24GjJOstBz4pJjEH9dGOGhfctJGlIrJAz++t836ctxga6XEZXIx9J2u0pFFiTVL1gK26GBFuK+BS7t0+ThKdfXDmZqupnRJjPwxprbwe+BT0iV97tPf8A0Kipg+mx7KFNqYUIwzbkT6Y768vYFlkAlbF4jrQ9HPqqWQ9V7Ul59ANNyUXJnxQ1M3ihVNryGHnax0Uy2pLXU2apdXszmWCEC2twal0d7ATaX+dV4PbgCz8huaCXhlGyMno2FN3zN1ZDIfI7kFv0YorrdGvkKIQZZymY65i6zZeE8mrBHuMrEbW4= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 590304a0-6405-41a0-ffe2-08da893b1ba9 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:18.8266 (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 07/11] avcodec/flac: Remove pointless 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: /X8a82MwPIHo Signed-off-by: Andreas Rheinhardt --- libavcodec/flac.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/flac.h b/libavcodec/flac.h index 7d6286bf0f..dbfca546cf 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -55,24 +55,23 @@ enum { FLAC_METADATA_TYPE_INVALID = 127 }; -#define FLACCOMMONINFO \ - int samplerate; /**< sample rate */\ - int channels; /**< number of channels */\ - int bps; /**< bits-per-sample */\ - /** * Data needed from the Streaminfo header for use by the raw FLAC demuxer * and/or the FLAC decoder. */ typedef struct FLACStreaminfo { - FLACCOMMONINFO + int samplerate; /**< sample rate */ + int channels; /**< number of channels */ + int bps; /**< bits-per-sample */ 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 { - FLACCOMMONINFO + int samplerate; /**< sample rate */ + int channels; /**< number of channels */ + int bps; /**< bits-per-sample */ int blocksize; /**< block size of the frame */ int ch_mode; /**< channel decorrelation mode */ int64_t frame_or_sample_num; /**< frame number or sample number */