[FFmpeg-cvslog] Merge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 17:13:01 2015 +0200| [deed77ffeecae9e2ddb8f2955b476cd7e8b9b959] | committer: Michael Niedermayer

Merge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'

* commit '28fa58cf5d939151108345d7ddddebbd51d9b684':
  dxva2: Fix build when only D3D11 or DXVA2 is used

Conflicts:
	libavcodec/dxva2_internal.h

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

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