[FFmpeg-cvslog] Merge commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 18:46:44 2017 -0300| [508fc80850225974a8d5b19f5906eadf6bd3636d] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=508fc80850225974a8d5b19f5906eadf6bd3636d
---