aacdec: drop channel reseting code.
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Apr 2012 07:43:13 +0000 (09:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Apr 2012 07:43:13 +0000 (09:43 +0200)
its no longer needed and causes a race with the flv demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c

index fd2e4a2..ba3a8f7 100644 (file)
@@ -374,9 +374,6 @@ static void pop_output_configuration(AACContext *ac) {
             ac->oc[1] = ac->oc[0];
             ac->avctx->channels = ac->oc[1].channels;
             ac->avctx->channel_layout = ac->oc[1].channel_layout;
-        }else{
-            ac->avctx->channels = 0;
-            ac->avctx->channel_layout = 0;
         }
     }
 }