diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-07-03 19:01:59 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-07-09 13:37:18 +0000 |
| commit | d5cf5afabbf43f00283e70b12afbe1da030d85b6 (patch) | |
| tree | f90930aaee18f386ddc35928d9fcf8186382efd0 /libavcodec/adxdec.c | |
| parent | f6ee61fb05482c617f5deee29a190d8ff483b3d1 (diff) | |
| download | ffmpeg-streaming-d5cf5afabbf43f00283e70b12afbe1da030d85b6.zip ffmpeg-streaming-d5cf5afabbf43f00283e70b12afbe1da030d85b6.tar.gz | |
adxdec: get rid of an avpriv function
The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.
Diffstat (limited to 'libavcodec/adxdec.c')
| -rw-r--r-- | libavcodec/adxdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 17d5bec..14fddf5 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -40,9 +40,9 @@ static av_cold int adx_decode_init(AVCodecContext *avctx) int ret, header_size; if (avctx->extradata_size >= 24) { - if ((ret = avpriv_adx_decode_header(avctx, avctx->extradata, - avctx->extradata_size, &header_size, - c->coeff)) < 0) { + if ((ret = ff_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; } @@ -110,8 +110,8 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, if (!c->header_parsed && buf_size >= 2 && AV_RB16(buf) == 0x8000) { int header_size; - if ((ret = avpriv_adx_decode_header(avctx, buf, buf_size, &header_size, - c->coeff)) < 0) { + if ((ret = ff_adx_decode_header(avctx, buf, buf_size, &header_size, + c->coeff)) < 0) { av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n"); return AVERROR_INVALIDDATA; } |
