Merge commit '3d040513a1de4797a4f81dde4984395f51db76b7'

* commit '3d040513a1de4797a4f81dde4984395f51db76b7':
  avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects
  decode: fix the code reducing cropping to preserve alignment

This commit is a noop, see
02327d1237
0c1c514643

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-31 13:06:53 -03:00
commit 51e091e2dc

Diff Content Not Available