1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-18 10:21:39 +02:00

Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'

* commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9':
  dca: Read params->pancABIT0[param_index] only if part0 is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-17 20:32:46 +01:00
commit 6d57da9aa4

View File

@ -514,8 +514,8 @@ int ff_dca_xll_decode_audio(DCAContext *s, AVFrame *frame)
}
for (i = 0; i < chset->channels; i++) {
int param_index = params->seg_type ? 0 : i;
int bits = params->pancABIT0[param_index];
int part0 = params->nSamplPart0[param_index];
int bits = part0 ? params->pancABIT0[param_index] : 0;
int *sample_buf = s->xll_sample_buf +
(in_channel + i) * s->xll_smpl_in_seg;