1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00

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
3303511f33
865360ba63
ab28108a36
5659f74047
70143a3954

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-01 18:46:44 -03:00
commit 508fc80850

Diff Content Not Available