ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Sat Oct 6 18:43:28 2018 +0100| [1f1ec958f6c68a5ceafea206a99c895f62d0f3ec] | committer: Mark Thompson
Merge commit '21733b39d0af5211d7b9f168ff3667ea86362e2b' * commit '21733b39d0af5211d7b9f168ff3667ea86362e2b': lavu/qsv: fix a random hwupload failure regression Fixes CID #1439585. Merged-by: Mark Thompson <s...@jkqxz.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f1ec958f6c68a5ceafea206a99c895f62d0f3ec --- libavutil/hwcontext_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 9d64c7344f..a581d2a401 100644 --- 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 ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
