[FFmpeg-cvslog] Merge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri May  5 10:48:36 2017 +0200| [055d6c2ea92e56b01467563cffb41fc3754bc661] | committer: Clément Bœsch

Merge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'

* commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a':
  dxva2: Make ff_dxva2_get_surface() static and drop its name prefix

This commit is a noop, see fd0716b364f83257caab723e2bb7c65483cb2073

Merged-by: Clément Bœsch <cboesch at gopro.com>

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