diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 13:30:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 13:31:09 +0200 |
commit | 5fa56e6e623948e7316c2d3d1a221e4ab48f6cc4 (patch) | |
tree | c8e6ebaa65b3a08b420ede9bfae3d9b568320b29 /libavformat/utils.c | |
parent | cf7f798984a9d93a2297ecbf203b85a660317e31 (diff) | |
parent | 744e7eea5d815efea777b6179d96e8d94b63ccfa (diff) | |
download | ffmpeg-5fa56e6e623948e7316c2d3d1a221e4ab48f6cc4.tar.gz |
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>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions