Merge commit '31de41babcd96f8ac2e6632454737aecb3710df7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 15:09:25 +0000 (17:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 15:09:57 +0000 (17:09 +0200)
* commit '31de41babcd96f8ac2e6632454737aecb3710df7':
  configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va

Conflicts:
configure

See: a838b22bd9f75028cdfb55bf9b322b3f3544421b
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge