summaryrefslogtreecommitdiff
path: root/libavcodec/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-08 02:33:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-08 02:33:39 +0200
commit990605768c86eb3281c3a232df2d81ee5d3c6c41 (patch)
treec6803d903e3b01812e67f3bdd05030cb0751968d /libavcodec/aacdec.c
parent153d23ee39db0304bd2a9e7b26eef9562be07eb8 (diff)
downloadffmpeg-990605768c86eb3281c3a232df2d81ee5d3c6c41.tar.gz
avcodec/aacdec: Do not return a uninitialized value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r--libavcodec/aacdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 2d12512671..622cc5c087 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2987,8 +2987,10 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
if (avctx->debug & FF_DEBUG_STARTCODE)
av_log(avctx, AV_LOG_DEBUG, "Elem type:%x id:%x\n", elem_type, elem_id);
- if (!avctx->channels && elem_type != TYPE_PCE)
+ if (!avctx->channels && elem_type != TYPE_PCE) {
+ err = AVERROR_INVALIDDATA;
goto fail;
+ }
if (elem_type < TYPE_DSE) {
if (!(che=get_che(ac, elem_type, elem_id))) {