diff options
Diffstat (limited to 'libavcodec/flac.h')
| -rw-r--r-- | libavcodec/flac.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libavcodec/flac.h b/libavcodec/flac.h index 7ac2897404..25494ed667 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -57,22 +57,31 @@ enum FLACExtradataFormat { FLAC_EXTRADATA_FORMAT_FULL_HEADER = 1 }; +#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. */ #define FLACSTREAMINFO \ + FLACCOMMONINFO \ int max_blocksize; /**< maximum block size, in samples */\ int max_framesize; /**< maximum frame size, in bytes */\ - int samplerate; /**< sample rate */\ - int channels; /**< number of channels */\ - int bps; /**< bits-per-sample */\ int64_t samples; /**< total number of samples */\ typedef struct FLACStreaminfo { FLACSTREAMINFO } FLACStreaminfo; +typedef struct FLACFrameInfo { + FLACCOMMONINFO + int blocksize; /**< block size of the frame */ + int ch_mode; /**< channel decorrelation mode */ +} FLACFrameInfo; + /** * Parse the Streaminfo metadata block * @param[out] avctx codec context to set basic stream parameters |