]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 19:32:46 +0000 (20:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 19:32:57 +0000 (20:32 +0100)
* commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9':
  dca: Read params->pancABIT0[param_index] only if part0 is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dca_xll.c

Simple merge