diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 09:55:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 10:32:04 +0200 |
commit | e96c80154f7c8332530b39f490d604d79a106768 (patch) | |
tree | 3ddc52d6620e4ad4e3e59bb3e2e707617df60b20 /libavdevice | |
parent | 5a7a902ac3f7ec4620c28d6f7f8c04e7e107b1fa (diff) | |
parent | 1018a92219a38a812cf97761c6b3a5e66a400f4b (diff) | |
download | ffmpeg-e96c80154f7c8332530b39f490d604d79a106768.tar.gz |
Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'
* commit '1018a92219a38a812cf97761c6b3a5e66a400f4b':
jpeg2000: Check block length
See: 914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2
See: 582f53349eabd75164d4389503eb95048982cfdc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions