ffmpeg | branch: release/0.10 | Michael Niedermayer <michae...@gmx.at> | Sat
Mar 7 14:30:34 2015 +0100| [7f99fae1ec2903366ecc529d84d2542daa5f3c57] |
committer: Michael Niedermayer
avcodec/utils: Align YUV411 by as much as the other YUV variants
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash2.avi
Found-by: Thomas Lindroth <thomas.lindr...@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindr...@gmail.com>
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit e3201c38d53d2b8b24d0bc95d726b2cb1752dc12)
Conflicts:
libavcodec/utils.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f99fae1ec2903366ecc529d84d2542daa5f3c57
---
libavcodec/utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7cfb96d..a35da92 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -202,8 +202,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int
*width, int *height,
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){
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
