[FFmpeg-cvslog] Merge commit '744e7eea5d815efea777b6179d96e8d94b63ccfa' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 13:30:17 2014 +0200| [5fa56e6e623948e7316c2d3d1a221e4ab48f6cc4] | committer: Michael Niedermayer

Merge commit '744e7eea5d815efea777b6179d96e8d94b63ccfa' into release/1.1

* commit '744e7eea5d815efea777b6179d96e8d94b63ccfa':
  adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fa56e6e623948e7316c2d3d1a221e4ab48f6cc4
---