Commit 80e36425 authored by Janne Grunau's avatar Janne Grunau

aacdec: initialize sbr context only in new channel elements

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