Merge commit '564c023eba807b162527b17af40424de275fc795' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:48:15 +0000 (22:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:48:29 +0000 (22:48 +0200)
* commit '564c023eba807b162527b17af40424de275fc795':
  adpcm: Write the proper predictor in trellis mode in IMA QT

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

Trivial merge