Merge commit '771564945aa9aebe2f30192b925fcf4909225eca' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:46:00 +0000 (22:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:46:48 +0000 (22:46 +0200)
* commit '771564945aa9aebe2f30192b925fcf4909225eca':
  adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

See: a32765c4252eb106a2ade543026ef6f59e699bfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge