[FFmpeg-cvslog] Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 17:00:24 2015 +0200| [9cedb88f46b5a645cbd01986646e770593fe0ba4] | committer: Michael Niedermayer

Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'

* commit '674b79148ff29f40cbd569f5585bf99c71204bf5':
  hevc: Fix HWACCEL_MAX for D3D11

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

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