[FFmpeg-cvslog] Merge commit '3d040513a1de4797a4f81dde4984395f51db76b7'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 31 13:06:53 2017 -0300| [51e091e2dcf11171615b5d67aeba6b8e5d04de37] | committer: James Almer

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
02327d1237f19619272e7b04b715e807c16af6a5
0c1c514643d5e1645160d697fa4c27cd38c7c791

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

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