Merge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 02:37:43 +0000 (23:37 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 02:37:43 +0000 (23:37 -0300)
commit596a4cbd0a1bcd2a45fbc97538d4e9bf35bf14a2
tree667ebb2f9bccc2b2703c5a10df990a017e917a5d
parent11f3a7ae108ab26ce334d362f076bfdd9c803a43
parentc2f97f050870897575570708ac48c5c15e6a0dd8
Merge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'

* commit 'c2f97f050870897575570708ac48c5c15e6a0dd8':
  hwcontext_dxva2: support D3D9Ex

This commit is a noop, see 50708f4aa40ce96122cf93d9e36cca8024baf025

Merged-by: James Almer <jamrial@gmail.com>