[FFmpeg-cvslog] r23674 - trunk/libavcodec/aacdec.c

[alexc]

Author: alexc
Date: Mon Jun 21 06:07:19 2010
New Revision: 23674

Log:
aacdec: Factorize if (elem_type < TYPE_DSE).

Modified:
   trunk/libavcodec/aacdec.c

Modified: trunk/libavcodec/aacdec.c
==============================================================================
--- trunk/libavcodec/aacdec.c	Mon Jun 21 06:05:09 2010	(r23673)
+++ trunk/libavcodec/aacdec.c	Mon Jun 21 06:07:19 2010	(r23674)
@@ -2006,13 +2006,13 @@ static int aac_decode_frame(AVCodecConte
     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) {