diff options
| author | Mark Thompson <sw@jkqxz.net> | 2018-10-06 18:43:28 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-10-06 18:46:52 +0100 |
| commit | 1f1ec958f6c68a5ceafea206a99c895f62d0f3ec (patch) | |
| tree | 356fdc4c765555d740ad9571f638cdf8fc350e03 | |
| parent | 5a3ce4a92b84cded3aab7ffd7fb80e0c9130e74c (diff) | |
| parent | 21733b39d0af5211d7b9f168ff3667ea86362e2b (diff) | |
| download | ffmpeg-1f1ec958f6c68a5ceafea206a99c895f62d0f3ec.tar.gz | |
Merge commit '21733b39d0af5211d7b9f168ff3667ea86362e2b'
* commit '21733b39d0af5211d7b9f168ff3667ea86362e2b':
lavu/qsv: fix a random hwupload failure regression
Fixes CID #1439585.
Merged-by: Mark Thompson <sw@jkqxz.net>
| -rw-r--r-- | libavutil/hwcontext_qsv.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |