Merge commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f'

Browse Source

* 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>

...

This commit is contained in:

James Almer 2017-11-01 18:46:44 -03:00

parent 070336b89b f9e7a2f95a

commit 508fc80850

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available