wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/utils: Align YUV411 by as much as the other YUV variants

Browse source 
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash2.avi

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e3201c38d5)

Conflicts:

	libavcodec/utils.c
This commit is contained in:
Michael Niedermayer 2015-03-07 14:30:34 +01:00
parent c681f86a32
commit bd92af66a1
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/utils.c
View file

@ -161,8 +161,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l
break;
case PIX_FMT_YUV411P:
case PIX_FMT_UYYVYY411:
w_align=32;
h_align=8;
w_align = 32;
h_align = 16 * 2;
break;
case PIX_FMT_YUV410P:
if(s->codec_id == CODEC_ID_SVQ1){