Mercurial > libavcodec.hg
comparison aac.c @ 8814:ac7958d25361 libavcodec
AAC: Cosmetic alterations after the last commit
author | superdump |
---|---|
date | Thu, 12 Feb 2009 13:49:59 +0000 |
parents | 13db7a524778 |
children | 01271e32d74e |
comparison
equal
deleted
inserted
replaced
8813:13db7a524778 | 8814:ac7958d25361 |
---|---|
1572 instead of SCE[0] CPE[0] CPE[0] LFE[0]. If we seem to have | 1572 instead of SCE[0] CPE[0] CPE[0] LFE[0]. If we seem to have |
1573 encountered such a stream, transfer the LFE[0] element to SCE[1] */ | 1573 encountered such a stream, transfer the LFE[0] element to SCE[1] */ |
1574 ac->che[TYPE_SCE][elem_id] = ac->che[TYPE_LFE][0]; | 1574 ac->che[TYPE_SCE][elem_id] = ac->che[TYPE_LFE][0]; |
1575 ac->che[TYPE_LFE][0] = NULL; | 1575 ac->che[TYPE_LFE][0] = NULL; |
1576 } | 1576 } |
1577 if(elem_type < TYPE_DSE) { | 1577 if(elem_type < TYPE_DSE && !ac->che[elem_type][elem_id]) { |
1578 if(!ac->che[elem_type][elem_id]) | 1578 av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); |
1579 { | 1579 return -1; |
1580 av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); | |
1581 return -1; | |
1582 } | |
1583 } | 1580 } |
1584 | 1581 |
1585 switch (elem_type) { | 1582 switch (elem_type) { |
1586 | 1583 |
1587 case TYPE_SCE: | 1584 case TYPE_SCE: |