diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:54:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:54:11 +0100 |
| commit | cfef947f7f1f2520098e4e2763cf5ec2f7cc21c7 (patch) | |
| tree | baec1bd8e97531a4a5b3c342c24e594367bac45c /libavcodec/flac.h | |
| parent | b6a99563962c27380e14c6f725cc8f6ae9ee5d22 (diff) | |
| parent | c070a8751597e3aa1b443e88464da785d8966b14 (diff) | |
| download | ffmpeg-cfef947f7f1f2520098e4e2763cf5ec2f7cc21c7.tar.gz | |
Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'
* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
lavc: make avpriv_flac_parse_streaminfo() private on the next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flac.h')
| -rw-r--r-- | libavcodec/flac.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/flac.h b/libavcodec/flac.h index d85195fff0..ee6d4b5234 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -96,8 +96,13 @@ typedef struct FLACFrameInfo { * @param[out] s where parsed information is stored * @param[in] buffer pointer to start of 34-byte streaminfo data */ +void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, + const uint8_t *buffer); + +#if LIBAVCODEC_VERSION_MAJOR < 57 void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer); +#endif /** * Validate the FLAC extradata. |