Merge commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 21:46:44 +0000 (18:46 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 21:46:44 +0000 (18:46 -0300)
commit508fc80850225974a8d5b19f5906eadf6bd3636d
tree7f6cda0b8ed6dfadbb1372af04afc7ffc4539887
parent070336b89b0b7321f31f68dc1e430f85fa188e83
parentf9e7a2f95a7194a8736cc1416a03a1a0155a3e9f
Merge commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f'

* commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f':
  dxva: add support for new dxva2 and d3d11 hwaccel APIs
  dxva: move d3d11 locking/unlocking to functions
  dxva: preparations for new hwaccel API
  lavc: set avctx->hwaccel before init
  lavu: add new D3D11 pixfmt and hwcontext

This commit is a noop, see
3303511f33dcc1b708fc18072cd93bca62196676
865360ba633b09f1292d52ba6d07f16b6bcef6df
ab28108a361196134704071b7b34c42fc7d747c7
5659f7404731415c7e1cfdf4d8b0afeb6b1132de
70143a3954e1c4412efb2bf1a3a818adea2d3abf

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