Merge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:08:12 +0000 (14:08 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:08:12 +0000 (14:08 +0200)
commit0ab40e4477eae94b074d62007d89f67a54ab25a7
treed8153bc6faa8472878362c8b35910be5fe42893d
parentb010843594fee88a791185b83684e0e725007b7b
parentf67235a28cef44fcd97ae74ad53bbbc0d7f63d60
Merge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'

* commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60':
  dxva2: get the slice number directly from the surface in D3D11VA

This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb

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