apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-17 22:31:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

adxdec: get rid of an avpriv function

Browse Source 
The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.
This commit is contained in:
Anton Khirnov
2014-07-03 19:01:59 +00:00
parent f6ee61fb05
commit d5cf5afabb
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/adxdec.c
View File

@@ -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;
}