summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2015-03-07 14:30:34 +0100
committerMichael Niedermayer <[email protected]>2015-03-21 01:52:52 +0100
commit21533730fc9b8d39d1cc3d79254264723c7224a4 (patch)
tree6d713fb29e653fcb8c045ceb5df0122008c6a181
parent032476f8309bdbed00b2a4da03eb5b64ec5877c2 (diff)
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 <[email protected]> Tested-by: Thomas Lindroth <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit e3201c38d53d2b8b24d0bc95d726b2cb1752dc12) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b3bcec095e..d30ad2e72e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -374,7 +374,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
case AV_PIX_FMT_YUVJ411P:
case AV_PIX_FMT_UYYVYY411:
w_align = 32;
- h_align = 8;
+ h_align = 16 * 2;
break;
case AV_PIX_FMT_YUV410P:
if (s->codec_id == AV_CODEC_ID_SVQ1) {