# HG changeset patch # User alexc # Date 1277093239 0 # Node ID f3e007b379e5b22bdc7a075f4084b990118b2f58 # Parent c883aa4aa6167f0cd30ab8936b06b83e49de9bb4 aacdec: Factorize if (elem_type < TYPE_DSE). diff -r c883aa4aa616 -r f3e007b379e5 aacdec.c --- a/aacdec.c Mon Jun 21 04:05:09 2010 +0000 +++ b/aacdec.c Mon Jun 21 04:07:19 2010 +0000 @@ -2006,13 +2006,13 @@ 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) {