Merge commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 11:32:51 +0000 (13:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 11:32:56 +0000 (13:32 +0200)
* commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240':
  adpcm: Write the proper predictor in trellis mode in IMA QT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/adpcmenc.c

Simple merge