Merge commit 'fabfbfe5'

* commit 'fabfbfe5':
  dxva2: fix surface selection when compiled with both d3d11va and dxva2

This commit is a noop, see 153b36fcMerged-by: NClément Bœsch <cboesch@gopro.com>