[FFmpeg-cvslog] Merge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:20:34 2017 +0100| [1a5631dc716e61cb3fa60bf44b93c4ca5438f7c9] | committer: Clément Bœsch

Merge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'

* commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e':
  vaapi_h265: Add main 10 encode support

This commit is a noop, see b9514756ba2b4f764fb86500a8172a57acb58403

Merged-by: Clément Bœsch <u at pkh.me>

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