[FFmpeg-cvslog] Merge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'

[Michael Niedermayer]

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

Merge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'

* commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63':
  h264: Fix HWACCEL_MAX for D3D11

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

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