From: Tim Walker <tdskywalker@gmail.com>
Date: Mon, 18 Nov 2013 11:41:46 +0000 (+0100)
Subject: aac_ac3_parser: simplify an expression
X-Git-Tag: v10_alpha1~228
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69d4dbfd1faa99563065329656bbe597d612ca03;p=platform%2Fupstream%2Flibav.git

aac_ac3_parser: simplify an expression

Signed-off-by: Diego Biurrun <diego@biurrun.de>
---

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index b17cd4d52..00d95ad15 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -82,13 +82,9 @@ get_next:
     if (avctx->codec_id != AV_CODEC_ID_AAC) {
         avctx->sample_rate = s->sample_rate;
 
-        /* allow downmixing to stereo (or mono for AC-3) */
-        if(avctx->request_channels > 0 &&
-                avctx->request_channels < s->channels &&
-                (avctx->request_channels <= 2 ||
-                (avctx->request_channels == 1 &&
-                (avctx->codec_id == AV_CODEC_ID_AC3 ||
-                 avctx->codec_id == AV_CODEC_ID_EAC3)))) {
+        /* (E-)AC-3: allow downmixing to stereo or mono */
+        if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
+            avctx->request_channels < s->channels) {
             avctx->channels = avctx->request_channels;
         } else {
             avctx->channels = s->channels;