Merge commit '3d040513'

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

This commit is a noop, see
02327d12
0c1c5146Merged-by: James Almer <jamrial@gmail.com>