diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 03:33:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:50 +0100 |
| commit | 4640184c76f2da094dcbec54321d55b96153cb70 (patch) | |
| tree | 1d6e6cf9ef56370a4070b6b33399670fcf33c119 /libswscale/mlib | |
| parent | 20d95a8ad32bac435e894c036c587c259f52512c (diff) | |
| download | ffmpeg-4640184c76f2da094dcbec54321d55b96153cb70.tar.gz | |
avcodec/mjpegdec: Skip blocks which are outside the visible area
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash.avi
Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 08509c8f86626815a3e9e68d600d1aacbb8df4bf)
Conflicts:
libavcodec/mjpegdec.c
(cherry picked from commit 0bb0716d9c0699895abcef2d3954c1d6e4157cb2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/mlib')
0 files changed, 0 insertions, 0 deletions