From ed99e54d67bd5fa05423cb60c53453e7c27e5742 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 21 Jun 2010 04:07:19 +0000 Subject: [PATCH] aacdec: Factorize if (elem_type < TYPE_DSE). Originally committed as revision 23674 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aacdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 5079f5d44a..b10749ec08 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2006,13 +2006,13 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data, while ((elem_type = get_bits(&gb, 3)) != TYPE_END) { elem_id = get_bits(&gb, 4); - if (elem_type < TYPE_DSE && !(che=get_che(ac, elem_type, elem_id))) { + if (elem_type < TYPE_DSE) { + if (!(che=get_che(ac, elem_type, elem_id))) { av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); return -1; } - - if (elem_type < TYPE_DSE) samples = 1024; + } switch (elem_type) {