[FFmpeg-cvslog] Merge commit '2610c9528f86286e4c6e174411a26ff5b4815cde'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 09:46:33 2017 +0100| [6d6f79c737d41d0278f0f5ea7b10e2aea1561805] | committer: Clément Bœsch

Merge commit '2610c9528f86286e4c6e174411a26ff5b4815cde'

* commit '2610c9528f86286e4c6e174411a26ff5b4815cde':
  configure: Move initial VAAPI check to a more sensible place

This commit is a noop, see 17989dcf540c13a7122663f64c09dc830ffc3a41

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

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