Re: [libav-devel] [PATCH] dca: Account for lfe when checking for the channel count

2017-04-17 Thread Vittorio Giovara 
On Mon, Apr 17, 2017 at 8:53 AM, Luca Barbato  wrote:
> Bug-Id: 1037
> CC: libav-sta...@libav.org
> ---
>  libavcodec/dcadec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ok
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] dca: Account for lfe when checking for the channel count

2017-04-17 Thread Luca Barbato 
Bug-Id: 1037
CC: libav-sta...@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 &&
-- 
2.11.1

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel