[FFmpeg-cvslog] Merge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Sep 27 23:37:43 2017 -0300| [596a4cbd0a1bcd2a45fbc97538d4e9bf35bf14a2] | committer: James Almer

Merge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'

* commit 'c2f97f050870897575570708ac48c5c15e6a0dd8':
  hwcontext_dxva2: support D3D9Ex

This commit is a noop, see 50708f4aa40ce96122cf93d9e36cca8024baf025

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

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