From 06fd213eb608c23f58e290cfad6262b94e30fc74 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Wed, 25 May 2011 09:43:14 +0200
Subject: Do not reset channel_layout to 0.

The channel_layout may have been set by the demuxer.
---
 libavcodec/aacdec.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index c56c0af986..19d3b3678f 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -251,8 +251,6 @@ static av_cold int output_configure(AACContext *ac,
         }
 
         memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
-
-        avctx->channel_layout = 0;
     }
 
     avctx->channels = channels;
-- 
cgit v1.2.3