Merge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'
authorClément Bœsch <u@pkh.me>
Wed, 3 May 2017 10:28:20 +0000 (12:28 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 3 May 2017 10:28:20 +0000 (12:28 +0200)
commitbf0fde84d503280009e6f573ded2e43eae80901b
tree6241e88c8508480ceec1c8798049315a5cd803fb
parent9f1bca4e6f9094c6e887dc646f31fd6e8937b421
parent5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b
Merge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'

* commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b':
  nvenc: Update check for lookahead

This commit is a noop, see 67db4ff3b66e96a20ddf1c264d07e146334ae88e

Merged-by: Clément Bœsch <u@pkh.me>