Merge commit '744e7eea5d815efea777b6179d96e8d94b63ccfa' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 11:30:17 +0000 (13:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 11:31:09 +0000 (13:31 +0200)
commit5fa56e6e623948e7316c2d3d1a221e4ab48f6cc4
treec8e6ebaa65b3a08b420ede9bfae3d9b568320b29
parentcf7f798984a9d93a2297ecbf203b85a660317e31
parent744e7eea5d815efea777b6179d96e8d94b63ccfa
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@gmx.at>
libavcodec/adpcmenc.c