diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:42:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:49:27 +0200 |
| commit | cce254373c41b0b6c92cf71ad3099327a9f7b523 (patch) | |
| tree | 7a3e32241639eee3cf20fc044b151ceb6e6caeac /libavcodec/dcadec.c | |
| parent | 107a56c1ed8c95ea668a073fb865c4dac19ffd38 (diff) | |
| parent | 3802833bc1f79775a1547c5e427fed6e92b77e53 (diff) | |
Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
* commit '3802833bc1f79775a1547c5e427fed6e92b77e53':
dca: Respect the current limits in the downmixing capabilities
Conflicts:
libavcodec/dcadec.c
See: 8e77c3846e91b1af9df4084736257d9899156eef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index d1612e2d3a..dec7e2879c 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -968,7 +968,13 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) "Invalid channel mode %d\n", am); return AVERROR_INVALIDDATA; } - for (j = base_channel; j < FFMIN(s->prim_channels, FF_ARRAY_ELEMS(dca_default_coeffs[am])); j++) { + if (s->prim_channels > FF_ARRAY_ELEMS(dca_default_coeffs[0])) { + avpriv_request_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]; } |