generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests 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

12
libavformat/adxdec.c
View File

@@ -24,7 +24,6 @@
*/
#include "libavutil/intreadwrite.h"
#include "libavcodec/adx.h"
#include "avformat.h"
#include "internal.h"
@@ -66,7 +65,6 @@ static int adx_read_header(AVFormatContext *s)
{
ADXDemuxerContext *c = s->priv_data;
AVCodecContext *avctx;
int ret;
AVStream *st = avformat_new_stream(s, NULL);
if (!st)
@@ -87,11 +85,11 @@ static int adx_read_header(AVFormatContext *s)
}
avctx->extradata_size = c->header_size;
ret = avpriv_adx_decode_header(avctx, avctx->extradata,
avctx->extradata_size, &c->header_size,
NULL);
if (ret)
return ret;
if (avctx->extradata_size < 12) {
av_log(s, AV_LOG_ERROR, "Invalid extradata size.\n");
return AVERROR_INVALIDDATA;
}
avctx->sample_rate = AV_RB32(avctx->extradata + 8);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = s->iformat->raw_codec_id;