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)
commit6d57da9aa441d580f3c2c9ac80e826010674ec79
tree0fae0d915fab8ee73ecd4b36b4d84d66a5f310d9
parent1eb28479dab3d55a9c8aff63e0fb7a1dd3902cf0
parentc9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9
Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'

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

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