diff options
| -rw-r--r-- | libavcodec/flac.c | 10 | ||||
| -rw-r--r-- | libavcodec/flac.h | 5 | ||||
| -rw-r--r-- | libavcodec/flacdec.c | 4 |
3 files changed, 16 insertions, 3 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 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. diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 1333972d66..920bb3da93 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -106,7 +106,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; /* initialize based on the demuxer-supplied streamdata header */ - avpriv_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo); + ff_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo); ret = allocate_buffers(s); if (ret < 0) return ret; @@ -168,7 +168,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size) metadata_size != FLAC_STREAMINFO_SIZE) { return AVERROR_INVALIDDATA; } - avpriv_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, &buf[8]); + ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, &buf[8]); ret = allocate_buffers(s); if (ret < 0) return ret; |