Merge commit '0776e0ef6ba4160281ef3fabea43e670f3792b4a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 16:28:26 +0000 (18:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 16:28:53 +0000 (18:28 +0200)
* commit '0776e0ef6ba4160281ef3fabea43e670f3792b4a':
  adpcm: Write the proper predictor in trellis mode in IMA QT

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

Trivial merge