diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-10 19:00:15 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-09-21 15:19:06 +0200 |
| commit | 521cbcb7d37fa12bf1038d1a73bbabcbf62589ed (patch) | |
| tree | a47f595415d7d95589e02c44e90b03933b45ef6f | |
| parent | ce3ce08850f1690dff01d9bb4ed6a4274d52771e (diff) | |
| download | ffmpeg-521cbcb7d37fa12bf1038d1a73bbabcbf62589ed.tar.gz | |
dca: Respect the current limits in the downmixing capabilities
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 3802833bc1f79775a1547c5e427fed6e92b77e53)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/dca.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 61a056e13a..169c9b41b9 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -805,6 +805,13 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) "Invalid channel mode %d\n", am); return AVERROR_INVALIDDATA; } + + if (s->prim_channels > FF_ARRAY_ELEMS(dca_default_coeffs[0])) { + av_log_ask_for_sample(s->avctx, "Downmixing %d channels", + s->prim_channels); + return AVERROR_PATCHWELCOME; + } + for (j = base_channel; j < s->prim_channels; j++) { s->downmix_coef[j][0] = dca_default_coeffs[am][j][0]; s->downmix_coef[j][1] = dca_default_coeffs[am][j][1]; |