diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 03:33:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 11:59:23 +0100 |
| commit | 7e7772c13ad8c75786f3980ad4e118158697d4db (patch) | |
| tree | 04bd0d86d4bb86f6ed195369161cd358fa7ea01e /libavcodec/vdpau_mpeg4.c | |
| parent | ac8ef33f9a397ed6ddfe936a2bdd6866ecb211dc (diff) | |
| download | ffmpeg-7e7772c13ad8c75786f3980ad4e118158697d4db.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 b881a97b9977b79dfe3ce02d61542c630fe78c14)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_mpeg4.c')
0 files changed, 0 insertions, 0 deletions