aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flac.h
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-08-28 16:34:28 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-09-02 11:55:22 +0200
commitf118b2aa46aa176d41acc05e65a30b64f8d6e564 (patch)
tree0bee54da7e341a477afb90b1e6599c41b1e8e168 /libavcodec/flac.h
parent6699ed38f37d2b6a9512cf61b8f51a7c38ffc988 (diff)
downloadffmpeg-f118b2aa46aa176d41acc05e65a30b64f8d6e564.tar.gz
avcodec/flac: Remove pointless define
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/flac.h')
-rw-r--r--libavcodec/flac.h13
1 files 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 */