Merge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:20:34 +0000 (11:20 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:20:34 +0000 (11:20 +0100)
commit1a5631dc716e61cb3fa60bf44b93c4ca5438f7c9
treee8baddc71dbd529b9759d29a12391b9812db9ff0
parentc4f613fe5120e9e0217fc104fba6fcfbf59b6575
parent5a5df90d9c05d86d9b0564b8b40b6d64a324df5e
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@pkh.me>