[FFmpeg-cvslog] Merge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 19:57:31 2017 -0300| [074e636c5ca1f9e9ab2f1eda1a36e7cb978f9af1] | committer: James Almer

Merge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'

* commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360':
  dxva2: Adjust multiple inclusion guard names to follow convention

This commit is a noop, see 180f9a09588d1c68983692bb5245213956fdde11

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

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