diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:32:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:32:57 +0100 |
| commit | 6d57da9aa441d580f3c2c9ac80e826010674ec79 (patch) | |
| tree | 0fae0d915fab8ee73ecd4b36b4d84d66a5f310d9 | |
| parent | 1eb28479dab3d55a9c8aff63e0fb7a1dd3902cf0 (diff) | |
| parent | c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9 (diff) | |
| download | ffmpeg-6d57da9aa441d580f3c2c9ac80e826010674ec79.tar.gz | |
Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'
* commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9':
dca: Read params->pancABIT0[param_index] only if part0 is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dca_xll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index 036b713e46..9e1085c394 100644 --- 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; |