diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:37:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:38:13 +0200 |
| commit | e932ae5940562ae0a183687053a5457a76fd1fa9 (patch) | |
| tree | d60f2db127f068f058a0b44adfeca3d580ba542a /libavcodec/adxdec.c | |
| parent | 1b58f1376132026a7633fea253f0ed67a8392343 (diff) | |
| parent | d5cf5afabbf43f00283e70b12afbe1da030d85b6 (diff) | |
| download | ffmpeg-streaming-e932ae5940562ae0a183687053a5457a76fd1fa9.zip ffmpeg-streaming-e932ae5940562ae0a183687053a5457a76fd1fa9.tar.gz | |
Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
adxdec: get rid of an avpriv function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 ec33e73..5115ced 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; } @@ -111,8 +111,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; } |
