From: Tim Walker <tdskywalker@gmail.com>
Date: Tue, 22 Jan 2013 20:53:53 +0000 (+0100)
Subject: flac: don't check the number of channels before setting the channel layout.
X-Git-Tag: android-x86-4.4-r1~364^2~1918
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=41244e13d5452e70cfd42f76ede4a20b7081c71f;p=android-x86%2Fexternal-ffmpeg.git

flac: don't check the number of channels before setting the channel layout.

This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---

diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
index 3d8e17f995..ee92ee3b0d 100644
--- a/libavcodec/flac_parser.c
+++ b/libavcodec/flac_parser.c
@@ -458,7 +458,7 @@ static int get_best_header(FLACParseContext* fpc, const uint8_t **poutbuf,
     }
 
     if (header->fi.channels != fpc->avctx->channels ||
-        (!fpc->avctx->channel_layout && header->fi.channels <= 6)) {
+        !fpc->avctx->channel_layout) {
         fpc->avctx->channels = header->fi.channels;
         ff_flac_set_channel_layout(fpc->avctx);
     }
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 51fd19628c..f273d145cb 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -426,7 +426,7 @@ static int decode_frame(FLACContext *s)
             return ret;
     }
     s->channels = s->avctx->channels = fi.channels;
-    if (!s->avctx->channel_layout && s->channels <= 6)
+    if (!s->avctx->channel_layout)
         ff_flac_set_channel_layout(s->avctx);
     s->ch_mode = fi.ch_mode;