From 9d2dd356c2eb1ac403f05e7975e3a904e844aa17 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 26 Nov 2011 17:00:00 -0500 Subject: adx: rename ff_adx_decode_header() to avpriv_adx_decode_header() It is used by the ADX decoder, and therefore needs to be exported in order to work with shared libs. --- libavcodec/adx.c | 4 ++-- libavcodec/adx.h | 4 ++-- libavcodec/adx_parser.c | 4 ++-- libavcodec/adxdec.c | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/adx.c b/libavcodec/adx.c index 9f03e930be..aa90fd89c3 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -34,8 +34,8 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff) coeff[1] = lrintf(-(c * c) * (1 << bits)); } -int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, int bufsize, - int *header_size, int *coeff) +int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, + int bufsize, int *header_size, int *coeff) { int offset, cutoff; diff --git a/libavcodec/adx.h b/libavcodec/adx.h index 93d547dcb2..da40eec929 100644 --- a/libavcodec/adx.h +++ b/libavcodec/adx.h @@ -74,7 +74,7 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff); * @param[out] coeff 2 LPC coefficients, can be NULL * @return data offset or negative error code if header is invalid */ -int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, int bufsize, - int *header_size, int *coeff); +int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, + int bufsize, int *header_size, int *coeff); #endif /* AVCODEC_ADX_H */ diff --git a/libavcodec/adx_parser.c b/libavcodec/adx_parser.c index 6de5ad48d1..ebcb1370e5 100644 --- a/libavcodec/adx_parser.c +++ b/libavcodec/adx_parser.c @@ -53,8 +53,8 @@ static int adx_parse(AVCodecParserContext *s1, ff_combine_frame(pc, END_NOT_FOUND, &buf, &buf_size); if (!s->header_size && pc->index >= MIN_HEADER_SIZE) { - if (ret = ff_adx_decode_header(avctx, pc->buffer, pc->index, - &s->header_size, NULL)) + if (ret = avpriv_adx_decode_header(avctx, pc->buffer, pc->index, + &s->header_size, NULL)) return AVERROR_INVALIDDATA; s->block_size = BLOCK_SIZE * avctx->channels; } diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index ca96a904d6..4558060781 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -41,8 +41,9 @@ static av_cold int adx_decode_init(AVCodecContext *avctx) if (avctx->extradata_size < 24) return AVERROR_INVALIDDATA; - if ((ret = ff_adx_decode_header(avctx, avctx->extradata, avctx->extradata_size, - &header_size, c->coeff)) < 0) { + if ((ret = avpriv_adx_decode_header(avctx, avctx->extradata, + avctx->extradata_size, &header_size, + c->coeff)) < 0) { av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n"); return AVERROR_INVALIDDATA; } -- cgit v1.2.3