From: Clément Bœsch Date: Thu, 23 Mar 2017 10:20:34 +0000 (+0100) Subject: Merge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e' X-Git-Tag: n3.3~428 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=1a5631dc716e61cb3fa60bf44b93c4ca5438f7c9;hp=-c 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 --- 1a5631dc716e61cb3fa60bf44b93c4ca5438f7c9