From d11af75c1965de17714cf5e0f23298cf360ee1ce Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Tue, 26 Feb 2019 11:54:23 +0100 Subject: [PATCH 1/2] avcodec/proresenc_aw : fix sub_image_with_fill for interlaced encoding used when width and/or height, not multiple of sclice dim --- libavcodec/proresenc_anatoliy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index e287d176ad..5914445b52 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -484,10 +484,10 @@ static inline void subimage_with_fill_template(uint16_t *src, unsigned x, unsign box_height = FFMIN(height - y, dst_height); } else { src_stride = stride; /* 2 lines stride */ - src += y * src_stride * 2 + x; + src += y * src_stride + x; box_height = FFMIN(height - y * 2, dst_height); if (!is_top_field) - src += src_stride; + src += stride >> 1; } for (i = 0; i < box_height; ++i) { -- 2.17.2 (Apple Git-113)