[FFmpeg-cvslog] Merge commit 'b9875b497a38f494acb599083b0d004545958697'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  3 18:41:02 2015 +0200| [511638151102462627ad54e3dffb9aa9cc9afe5e] | committer: Michael Niedermayer

Merge commit 'b9875b497a38f494acb599083b0d004545958697'

* commit 'b9875b497a38f494acb599083b0d004545958697':
  configure: Remove unnecessary tests for d3d11va

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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