From 2d81acaa1adf2280d74d280491f05f0baa4a31d9 Mon Sep 17 00:00:00 2001 From: Linjie Fu Date: Mon, 15 Apr 2019 21:23:40 +0800 Subject: [PATCH] lavu/hwcontext_qsv: Fix the realign check for hwupload Fix the aligned check in hwupload, input surface should be 16 aligned too. Partly fix #7830. Signed-off-by: Linjie Fu Signed-off-by: Zhong Li --- libavutil/hwcontext_qsv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 8f9838d7d8..49b5952cef 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -892,8 +892,7 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, if (ret < 0) return ret; - - if (src->height & 16 || src->linesize[0] & 16) { + if (src->height & 15 || src->linesize[0] & 15) { realigned = 1; memset(&tmp_frame, 0, sizeof(tmp_frame)); tmp_frame.format = src->format;