From aef5150719f03ce87e67c17d2006e24d8961aa17 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sun, 16 Dec 2012 11:02:39 -0500
Subject: flac: only set channel layout if not previously set or on channel
 count change

Fixes Bug 402
---
 libavcodec/flacdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libavcodec/flacdec.c')

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index fd47929c50..51fd19628c 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -426,7 +426,8 @@ static int decode_frame(FLACContext *s)
             return ret;
     }
     s->channels = s->avctx->channels = fi.channels;
-    ff_flac_set_channel_layout(s->avctx);
+    if (!s->avctx->channel_layout && s->channels <= 6)
+        ff_flac_set_channel_layout(s->avctx);
     s->ch_mode = fi.ch_mode;
 
     if (!s->bps && !fi.bps) {
-- 
cgit v1.2.3