[FFmpeg-cvslog] dca: Account for lfe when checking for the channel count

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Mon Apr 17 12:53:14 2017 +0000| [5352802da81f2083e65d466612e639a4e6e5530e] | committer: Sean McGovern

dca: Account for lfe when checking for the channel count

Bug-Id: 1037
CC: libav-stable at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5352802da81f2083e65d466612e639a4e6e5530e
---

 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 &&