[libav-devel] [PATCH 5/7] ac3dec: simplify an expression.

Tim Walker tdskywalker at gmail.com
Mon Nov 18 12:41:47 CET 2013


---
 libavcodec/ac3dec.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 3edb3af..6419208 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -178,9 +178,8 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
     /* allow downmixing to stereo or mono */
-    if (avctx->channels > 0 && avctx->request_channels > 0 &&
-            avctx->request_channels < avctx->channels &&
-            avctx->request_channels <= 2) {
+    if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
+        avctx->request_channels < avctx->channels) {
         avctx->channels = avctx->request_channels;
     }
     s->downmixed = 1;
-- 
1.8.3.4 (Apple Git-47)



More information about the libav-devel mailing list