diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 23:42:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 23:42:54 +0200 |
commit | 37cf695af0ae8d418c4cfad9f997f1874563b603 (patch) | |
tree | 78051d6a0f808cd71fb701e04ab95b1155886207 /libavcodec/bmp_parser.c | |
parent | faabef3d3d850efb7af61ecaff9810feefc5523e (diff) | |
parent | 3d79d0c93e5b37a35b1b22d6c18699c233aad1ba (diff) | |
download | ffmpeg-37cf695af0ae8d418c4cfad9f997f1874563b603.tar.gz |
Merge commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba'
* commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba':
adpcm: Avoid reading out of bounds in the IMA QT trellis encoder
See: a32765c4252eb106a2ade543026ef6f59e699bfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp_parser.c')
0 files changed, 0 insertions, 0 deletions