Browse Source

aacdec: initialize sbr context only in new channel elements

tags/n0.9
Janne Grunau 13 years ago
parent
commit
80e36425fb
1 changed files with 5 additions and 3 deletions
  1. +5
    -3
      libavcodec/aacdec.c

+ 5
- 3
libavcodec/aacdec.c View File

@@ -184,9 +184,11 @@ static av_cold int che_configure(AACContext *ac,
int type, int id, int *channels)
{
if (che_pos[type][id]) {
if (!ac->che[type][id] && !(ac->che[type][id] = av_mallocz(sizeof(ChannelElement))))
return AVERROR(ENOMEM);
ff_aac_sbr_ctx_init(ac, &ac->che[type][id]->sbr);
if (!ac->che[type][id]) {
if (!(ac->che[type][id] = av_mallocz(sizeof(ChannelElement))))
return AVERROR(ENOMEM);
ff_aac_sbr_ctx_init(ac, &ac->che[type][id]->sbr);
}
if (type != TYPE_CCE) {
ac->output_data[(*channels)++] = ac->che[type][id]->ch[0].ret;
if (type == TYPE_CPE ||


Loading…
Cancel
Save