Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'

* commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9': dca: Read params->pancABIT0[param_index] only if part0 is set Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 6d57da9aa4
parent 1eb28479da c9ed48e80e
commit 6d57da9aa4
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/dca_xll.c
+++ b/libavcodec/dca_xll.c
@ -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;