diff options
author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-04-16 16:58:32 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-17 15:20:30 +0200 |
commit | 621f1a2e63647251472b59ab9712174570647d5e (patch) | |
tree | 803b5bcee10fc07b16d12236b614cb29f30de74b | |
parent | 9a241d95efa1f6cc545a098160609fd3ba64d844 (diff) | |
download | ffmpeg-621f1a2e63647251472b59ab9712174570647d5e.tar.gz |
aacdec: consistently use avctx for logging in decode_eld_specific_config
ac may be NULL and then accessing ac->avctx results in a segmentation fault.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5b75689b987e4c4dd4f34d5c8be389547e9cc701)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 381e316994..1aa1a80675 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -904,7 +904,7 @@ static int decode_eld_specific_config(AACContext *ac, AVCodecContext *avctx, if (len == 15 + 255) len += get_bits(gb, 16); if (get_bits_left(gb) < len * 8 + 4) { - av_log(ac->avctx, AV_LOG_ERROR, overread_err); + av_log(avctx, AV_LOG_ERROR, overread_err); return AVERROR_INVALIDDATA; } skip_bits_long(gb, 8 * len); |