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)
commitd47e96090cfadafaa04f776bc1e4a892c62209a8
tree430640df76e9fd17b9abee488fa81fa459396f7f
parent0bbd46c6903b0d0df8113fa205d9b1b9317179ae
parent771564945aa9aebe2f30192b925fcf4909225eca
Merge commit '771564945aa9aebe2f30192b925fcf4909225eca' into release/2.2

* commit '771564945aa9aebe2f30192b925fcf4909225eca':
  adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

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