From 5f401ee03c78f82850de3ffb457a01427fa3cb55 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 12 Feb 2009 13:49:59 +0000 Subject: [PATCH] AAC: Cosmetic alterations after the last commit Originally committed as revision 17182 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/aac.c b/libavcodec/aac.c index f803d79624..904c9510c8 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -1574,12 +1574,9 @@ static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data ac->che[TYPE_SCE][elem_id] = ac->che[TYPE_LFE][0]; ac->che[TYPE_LFE][0] = NULL; } - if(elem_type < TYPE_DSE) { - if(!ac->che[elem_type][elem_id]) - { - av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); - return -1; - } + if(elem_type < TYPE_DSE && !ac->che[elem_type][elem_id]) { + av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); + return -1; } switch (elem_type) {