[FFmpeg-cvslog] avcodec/utils: Align YUV411 by as much as the other YUV variants
Michael Niedermayer
git at videolan.org
Sat Mar 21 02:30:09 CET 2015
ffmpeg | branch: release/2.5 | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 7 14:30:34 2015 +0100| [21533730fc9b8d39d1cc3d79254264723c7224a4] | 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.lindroth at gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e3201c38d53d2b8b24d0bc95d726b2cb1752dc12)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21533730fc9b8d39d1cc3d79254264723c7224a4
---
libavcodec/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b3bcec0..d30ad2e 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) {
More information about the ffmpeg-cvslog
mailing list