[FFmpeg-cvslog] avformat/adxdec: set avctx->channels in adx_read_header
Andreas Cadhalpun
git at videolan.org
Thu Feb 26 12:37:31 CET 2015
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Thu Feb 26 01:06:57 2015 +0100| [64ea4a0598e7ca61b95cf6c93fd409151a448001] | committer: Michael Niedermayer
avformat/adxdec: set avctx->channels in adx_read_header
It is used in adx_read_packet, which currently depends on the decoder/parser setting this value between reading the file header and demuxing the first packet.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64ea4a0598e7ca61b95cf6c93fd409151a448001
---
libavformat/adxdec.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
index ddaa201..e57d051 100644
--- a/libavformat/adxdec.c
+++ b/libavformat/adxdec.c
@@ -83,8 +83,14 @@ static int adx_read_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "Invalid extradata size.\n");
return AVERROR_INVALIDDATA;
}
+ avctx->channels = AV_RB8(avctx->extradata + 7);
avctx->sample_rate = AV_RB32(avctx->extradata + 8);
+ if (avctx->channels <= 0) {
+ av_log(s, AV_LOG_ERROR, "invalid number of channels %d\n", avctx->channels);
+ return AVERROR_INVALIDDATA;
+ }
+
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = s->iformat->raw_codec_id;
More information about the ffmpeg-cvslog
mailing list