From 5352802da81f2083e65d466612e639a4e6e5530e Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 17 Apr 2017 12:53:14 +0000 Subject: [PATCH] dca: Account for lfe when checking for the channel count Bug-Id: 1037 CC: libav-stable@libav.org --- libavcodec/dcadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index ed1ed2d5f3..3fe46cdc5c 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1300,7 +1300,7 @@ static int set_channel_layout(AVCodecContext *avctx, int channels) s->channel_order_tab = ff_dca_channel_reorder_nolfe[s->amode]; } - if (channels < ff_dca_channels[s->amode]) + if (channels < ff_dca_channels[s->amode] + !!s->lfe) return AVERROR_INVALIDDATA; if (channels > !!s->lfe &&