diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-06-21 04:07:19 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-06-21 04:07:19 +0000 |
| commit | ed99e54d67bd5fa05423cb60c53453e7c27e5742 (patch) | |
| tree | 3fe1517999adb08984213750b94a7d5bfd98458f /libavcodec/aacdec.c | |
| parent | fda36b5944301f868ccacd5f1eacaa1e0374bc1b (diff) | |
| download | ffmpeg-ed99e54d67bd5fa05423cb60c53453e7c27e5742.tar.gz | |
aacdec: Factorize if (elem_type < TYPE_DSE).
Originally committed as revision 23674 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 6 |
1 files 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) { |