Merge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 15:01:12 +0000 (17:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 15:01:35 +0000 (17:01 +0200)
* commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63':
  h264: Fix HWACCEL_MAX for D3D11

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

Trivial merge