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)
commit1f1ec958f6c68a5ceafea206a99c895f62d0f3ec
tree356fdc4c765555d740ad9571f638cdf8fc350e03
parent5a3ce4a92b84cded3aab7ffd7fb80e0c9130e74c
parent21733b39d0af5211d7b9f168ff3667ea86362e2b
Merge commit '21733b39d0af5211d7b9f168ff3667ea86362e2b'

* commit '21733b39d0af5211d7b9f168ff3667ea86362e2b':
  lavu/qsv: fix a random hwupload failure regression

Fixes CID #1439585.

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