Commit 5f401ee0 authored by Robert Swain's avatar Robert Swain

AAC: Cosmetic alterations after the last commit

Originally committed as revision 17182 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b2d9d4a5
...@@ -1574,13 +1574,10 @@ static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data ...@@ -1574,13 +1574,10 @@ 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 < TYPE_DSE) { if(elem_type < TYPE_DSE && !ac->che[elem_type][elem_id]) {
if(!ac->che[elem_type][elem_id])
{
av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id);
return -1; return -1;
} }
}
switch (elem_type) { switch (elem_type) {
......
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