diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-08-28 18:42:56 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-11-06 09:04:56 +0100 |
| commit | acc897e6b15776ed438b88ffe330ec48f6b50e48 (patch) | |
| tree | ffc8eba3e890122c25990927d8538f9ca0d50e9c | |
| parent | e839de0f851535b5e19256b52f9865f0cb768a7c (diff) | |
| download | ffmpeg-acc897e6b15776ed438b88ffe330ec48f6b50e48.tar.gz | |
lavc: make avpriv_flac_is_extradata_valid() private on the next bump
| -rw-r--r-- | libavcodec/flac.c | 9 | ||||
| -rw-r--r-- | libavcodec/flac.h | 9 | ||||
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 3a234d2c35..3e51fdeb98 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -166,7 +166,7 @@ int ff_flac_get_max_frame_size(int blocksize, int ch, int bps) return count; } -int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, +int ff_flac_is_extradata_valid(AVCodecContext *avctx, enum FLACExtradataFormat *format, uint8_t **streaminfo_start) { @@ -243,4 +243,11 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * { ff_flac_parse_streaminfo(avctx, s, buffer); } + +int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, + enum FLACExtradataFormat *format, + uint8_t **streaminfo_start) +{ + return ff_flac_is_extradata_valid(avctx, format, streaminfo_start); +} #endif diff --git a/libavcodec/flac.h b/libavcodec/flac.h index 1b8177465d..3229682047 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -102,6 +102,9 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, #if LIBAVCODEC_VERSION_MAJOR < 57 void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer); +int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, + enum FLACExtradataFormat *format, + uint8_t **streaminfo_start); #endif /** @@ -111,9 +114,9 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * * @param[out] streaminfo_start pointer to start of 34-byte STREAMINFO data. * @return 1 if valid, 0 if not valid. */ -int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, - enum FLACExtradataFormat *format, - uint8_t **streaminfo_start); +int ff_flac_is_extradata_valid(AVCodecContext *avctx, + enum FLACExtradataFormat *format, + uint8_t **streaminfo_start); /** * Calculate an estimate for the maximum frame size based on verbatim mode. diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index cb72677c81..6cce6923f3 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -97,7 +97,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) if (!avctx->extradata) return 0; - if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo)) + if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo)) return AVERROR_INVALIDDATA; /* initialize based on the demuxer-supplied streamdata header */ |