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.c | |
| 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.c')
| -rw-r--r-- | libavcodec/flac.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 1053491340..4bd4a013ef 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -201,7 +201,7 @@ void ff_flac_set_channel_layout(AVCodecContext *avctx) avctx->channel_layout = 0; } -void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, +void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer) { GetBitContext gb; @@ -235,3 +235,11 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * skip_bits_long(&gb, 64); /* md5 sum */ skip_bits_long(&gb, 64); /* md5 sum */ } + +#if LIBAVCODEC_VERSION_MAJOR < 57 +void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, + const uint8_t *buffer) +{ + ff_flac_parse_streaminfo(avctx, s, buffer); +} +#endif |