[FFmpeg-cvslog] lavu/hwcontext_qsv: Fix the realign check for hwupload

Linjie Fu git at videolan.org
Tue Apr 30 12:15:35 EEST 2019


ffmpeg | branch: master | Linjie Fu <linjie.fu at intel.com> | Mon Apr 15 21:23:40 2019 +0800| [2d81acaa1adf2280d74d280491f05f0baa4a31d9] | committer: Zhong Li

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 <linjie.fu at intel.com>
Signed-off-by: Zhong Li <zhong.li at intel.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d81acaa1adf2280d74d280491f05f0baa4a31d9
---

 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;



More information about the ffmpeg-cvslog mailing list