[FFmpeg-cvslog] aacdec: drop channel reseting code.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 18 09:43:13 2012 +0200| [124eb7e476f7e3f66dcdc30f780a45b378751219] | committer: Michael Niedermayer

aacdec: drop channel reseting code.

its no longer needed and causes a race with the flv demuxer.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=124eb7e476f7e3f66dcdc30f780a45b378751219
---

 libavcodec/aacdec.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index fd2e4a2..ba3a8f7 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;
         }
     }
 }