Merge commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:42:15 +0000 (23:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:42:54 +0000 (23:42 +0200)
* commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba':
  adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

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

Trivial merge