aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2013-11-18 12:41:43 +0100
committerDiego Biurrun <diego@biurrun.de>2013-11-19 02:02:49 +0100
commit37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9 (patch)
treed87813f99740ef703e2091f6ef69c1c89808cfea
parenta553c6a347d3d28d7ee44c3df3d5c4ee780dba23 (diff)
downloadffmpeg-37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9.tar.gz
dcadec: simplify an expression
Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r--libavcodec/dcadec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index c80bd81baa..7af5e5c51a 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1922,8 +1922,7 @@ static av_cold int dca_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
/* allow downmixing to stereo */
- if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
- avctx->request_channels == 2) {
+ if (avctx->channels > 2 && avctx->request_channels == 2) {
avctx->channels = avctx->request_channels;
}