diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2017-04-17 12:53:14 +0000 |
|---|---|---|
| committer | Sean McGovern <gseanmcg@gmail.com> | 2017-04-19 17:55:42 -0400 |
| commit | 5352802da81f2083e65d466612e639a4e6e5530e (patch) | |
| tree | a595c6d71d8cffe929d4caa191718d085f8c3d77 | |
| parent | 37f573543c4fd7f44339e04d8d15b95118493ddd (diff) | |
| download | ffmpeg-5352802da81f2083e65d466612e639a4e6e5530e.tar.gz | |
dca: Account for lfe when checking for the channel count
Bug-Id: 1037
CC: libav-stable@libav.org
| -rw-r--r-- | libavcodec/dcadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |