Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 09:13:08 +0000 (11:13 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 09:13:08 +0000 (11:13 +0200)
commit46998d037f8bfebee7bb6578df24a5a3b8f41299
tree4a5df8c6b8d8f549e7b721fa230b2ee6223d8e19
parent03f22c288aff7e2d75c7f993e8626195e84e0842
parentfabfbfe5710050812147f93a351a53fdda56ff8c
Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'

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

This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb

Merged-by: Clément Bœsch <cboesch@gopro.com>