From 124eb7e476f7e3f66dcdc30f780a45b378751219 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 18 Apr 2012 09:43:13 +0200 Subject: [PATCH] aacdec: drop channel reseting code. its no longer needed and causes a race with the flv demuxer. Signed-off-by: Michael Niedermayer --- libavcodec/aacdec.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index fd2e4a2198..ba3a8f7f9e 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -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; } } }