Merge commit '21733b39d0af5211d7b9f168ff3667ea86362e2b'
authorMark Thompson <sw@jkqxz.net>
Sat, 6 Oct 2018 17:43:28 +0000 (18:43 +0100)
committerMark Thompson <sw@jkqxz.net>
Sat, 6 Oct 2018 17:46:52 +0000 (18:46 +0100)
* commit '21733b39d0af5211d7b9f168ff3667ea86362e2b':
  lavu/qsv: fix a random hwupload failure regression

Fixes CID #1439585.

Merged-by: Mark Thompson <sw@jkqxz.net>
1  2 
libavutil/hwcontext_qsv.c

Simple merge