summaryrefslogtreecommitdiff
path: root/libavcodec/aac.c
diff options
context:
space:
mode:
authorRobert Swain <robert.swain@gmail.com>2008-08-29 20:18:34 +0000
committerRobert Swain <robert.swain@gmail.com>2008-08-29 20:18:34 +0000
commitf4fae46e6714fa07f899d9de3f1986181c0b101b (patch)
tree434954f3a1e62628a0e25a61d94ac81a235e9dd9 /libavcodec/aac.c
parent3a25c707fae3c6e99fdda40474c3d74be24cc4c3 (diff)
Remove unnecessary portion of a condition. This fixes issue607 and avoids
another unintended bug where channel coupling could have been run on an SCE. Originally committed as revision 15036 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.c')
-rw-r--r--libavcodec/aac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index d122ef9ec5..016294bd80 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -1348,7 +1348,7 @@ 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 && elem_type < TYPE_DSE) {
+ if(elem_type < TYPE_DSE) {
if(!ac->che[elem_type][elem_id])
return -1;
if(elem_type != TYPE_CCE)