From ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79 Mon Sep 17 00:00:00 2001 From: Tim Walker Date: Mon, 18 Nov 2013 12:41:47 +0100 Subject: ac3dec: simplify an expression Signed-off-by: Diego Biurrun --- libavcodec/ac3dec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavcodec/ac3dec.c') diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 3edb3aff83..641920860e 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; -- cgit v1.2.3