[FFmpeg-cvslog] Merge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed May  3 12:28:20 2017 +0200| [bf0fde84d503280009e6f573ded2e43eae80901b] | committer: Clément Bœsch

Merge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'

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

This commit is a noop, see 67db4ff3b66e96a20ddf1c264d07e146334ae88e

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf0fde84d503280009e6f573ded2e43eae80901b
---