Merge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:48:36 +0000 (10:48 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:48:36 +0000 (10:48 +0200)
commit055d6c2ea92e56b01467563cffb41fc3754bc661
tree66491c83a412fafb161cbe74778a6cdc7ff4980e
parente6ee42febbdeaaab779a66c5002155c78a3eae8d
parentf8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a
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@gopro.com>