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)
commit65b839e43a5b32dabef63572a584e81528c2f956
tree430640df76e9fd17b9abee488fa81fa459396f7f
parentd47e96090cfadafaa04f776bc1e4a892c62209a8
parent564c023eba807b162527b17af40424de275fc795
Merge commit '564c023eba807b162527b17af40424de275fc795' into release/2.2

* commit '564c023eba807b162527b17af40424de275fc795':
  adpcm: Write the proper predictor in trellis mode in IMA QT

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