diff mbox series

[FFmpeg-devel,07/11] avcodec/flac: Remove pointless define

Message ID AS8P250MB07444BCA87FA3EA0A55E59BE8F779@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit f118b2aa46aa176d41acc05e65a30b64f8d6e564
Headers show
Series [FFmpeg-devel,01/11] avcodec/mpeg4video: Factor non-codec stuff out into a header of its own | expand

Commit Message

Andreas Rheinhardt Aug. 28, 2022, 9:19 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/flac.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
diff mbox series

Patch

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   */