Commit f4fae46e authored by Robert Swain's avatar Robert Swain

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
parent 3a25c707
...@@ -1348,7 +1348,7 @@ static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data ...@@ -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_SCE][elem_id] = ac->che[TYPE_LFE][0];
ac->che[TYPE_LFE][0] = NULL; 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]) if(!ac->che[elem_type][elem_id])
return -1; return -1;
if(elem_type != TYPE_CCE) if(elem_type != TYPE_CCE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment