[FFmpeg-cvslog] Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Thu Mar 30 11:13:08 2017 +0200| [46998d037f8bfebee7bb6578df24a5a3b8f41299] | committer: Clément Bœsch

Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'

* commit 'fabfbfe5710050812147f93a351a53fdda56ff8c':
  dxva2: fix surface selection when compiled with both d3d11va and dxva2

This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb

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

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