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)
commit6333c6c17d1f43df0a5f07fdcaee40122fddcd60
tree7694c9a9730e0c3a25ec33204637e59c6e325bd2
parent5fa56e6e623948e7316c2d3d1a221e4ab48f6cc4
parent21d3e0ac9e1719d8444b3f5466983587ac0ad240
Merge commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240' into release/1.1

* commit '21d3e0ac9e1719d8444b3f5466983587ac0ad240':
  adpcm: Write the proper predictor in trellis mode in IMA QT

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