aacdec: initialize sbr context only in new channel elements

13 years ago · 80e36425fb
parent b2e56e08c9
commit 80e36425fb
1 changed files with 5 additions and 3 deletions
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@ -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 ||