[FFmpeg-cvslog] avcodec/flac: Remove pointless define
Andreas Rheinhardt
git at videolan.org
Fri Sep 2 13:00:04 EEST 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sun Aug 28 16:34:28 2022 +0200| [f118b2aa46aa176d41acc05e65a30b64f8d6e564] | committer: Andreas Rheinhardt
avcodec/flac: Remove pointless define
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f118b2aa46aa176d41acc05e65a30b64f8d6e564
---
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 */
More information about the ffmpeg-cvslog
mailing list