Module: libav Branch: release/12 Commit: 2e59f8d9f95895450fe7604d630dfe74ae967224
Author: Luca Barbato <[email protected]> Committer: Sean McGovern <[email protected]> Date: Mon Apr 17 12:53:14 2017 +0000 dca: Account for lfe when checking for the channel count Bug-Id: 1037 CC: [email protected] (cherry picked from commit 5352802da81f2083e65d466612e639a4e6e5530e) Signed-off-by: Sean McGovern <[email protected]> --- libavcodec/dcadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index af26dce..c82c54e 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1297,7 +1297,7 @@ static int set_channel_layout(AVCodecContext *avctx, int channels, int num_core_ 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 && _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
