Merge commit '21733b39d0af5211d7b9f168ff3667ea86362e2b'

* commit '21733b39d0af5211d7b9f168ff3667ea86362e2b': lavu/qsv: fix a random hwupload failure regression Fixes CID #1439585. Merged-by: Mark Thompson <sw@jkqxz.net>
7 years ago · 1f1ec958f6
parent 5a3ce4a92b 21733b39d0
commit 1f1ec958f6
1 changed files with 1 additions and 1 deletions
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@ -833,7 +833,7 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,

    mfxSyncPoint sync = NULL;
    mfxStatus err;
-    int ret;
+    int ret = 0;

    while (!s->session_upload_init && !s->session_upload && !ret) {
 #if HAVE_PTHREADS