Merge commit '3fdf50f9e864c88da2139cf066832944de81acaa'
authorJames Almer <jamrial@gmail.com>
Mon, 6 Nov 2017 21:30:48 +0000 (18:30 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 6 Nov 2017 21:30:48 +0000 (18:30 -0300)
commita82a10e08f5d4f206e1e6781653d75f82d3de6c6
treed18ca79e1c95f78dc24f23d91c70717ca4297ca2
parentd9e59029a1569c1dd8dafd160682fc4ea5f5bc33
parent3fdf50f9e864c88da2139cf066832944de81acaa
Merge commit '3fdf50f9e864c88da2139cf066832944de81acaa'

* commit '3fdf50f9e864c88da2139cf066832944de81acaa':
  hwframe: Allow hwaccel frame allocators to align surface sizes
  dxva: verbose-log decoder GUID list
  hwcontext_d3d11va: add option to enable debug mode
  dxva: support DXGI_FORMAT_420_OPAQUE decoding
  hwcontext_d3d11va: allocate staging texture lazily
  hwcontext_d3d11va: fix crash on frames_init failure
  dxva: fix some warnings
  dxva: add declarative profile checks

This commit is a noop, see
e2afcc33e0bcba92ab6c767f09f17a67911a4928
39f201a0ec7913f7509a01fb0fa6634a24e52203
1509d739a036b9838e12f28dac9f09ac37bc3928
6f5ff3269b12776a32b12887128ba034ad86e08b
8d7fdba7b8670db9dd5023dde6fe3a06674933c4
289d387330d8a0a07ff98c9e09215627a70ace2d
f0bcedaf37ed4fdb082c88826b8bd3a5dd26382a
d14179e3d49eb0f2533db16151e01abb0018b165

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