diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 03:39:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 22:43:43 +0100 |
| commit | 0bf48d24d7f220b70f5968b8f691abf2f7a398b3 (patch) | |
| tree | b9494e69355f86933f3fa0721c1d88d663664e0c | |
| parent | 2dcacbb68e835f74354e5289d841397872d5060b (diff) | |
| download | ffmpeg-0bf48d24d7f220b70f5968b8f691abf2f7a398b3.tar.gz | |
flvdec: Check avpriv_mpeg4audio_get_config() return
value before using its output.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5500e65342a2afc5caa8fe38496aa1a3b1f28cbc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flvdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index ce6d535753..d823628817 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -560,8 +560,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; if (st->codec->codec_id == CODEC_ID_AAC) { MPEG4AudioConfig cfg; - avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, - st->codec->extradata_size * 8, 1); + if (avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, + st->codec->extradata_size * 8, 1) >= 0) { st->codec->channels = cfg.channels; if (cfg.ext_sample_rate) st->codec->sample_rate = cfg.ext_sample_rate; @@ -569,6 +569,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) st->codec->sample_rate = cfg.sample_rate; av_dlog(s, "mp4a config channels %d sample rate %d\n", st->codec->channels, st->codec->sample_rate); + } } ret = AVERROR(EAGAIN); |