From 32363c86e5b1847289d9cc0dc741a5f536176225 Mon Sep 17 00:00:00 2001 From: Rodeo Date: Sat, 4 Jul 2015 22:56:15 +0000 Subject: libhb: disable OpenCL scaling when QSV scaling is used. This avoids issues with OpenCL buffer mapping. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7343 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/work.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libhb/work.c b/libhb/work.c index a31333d86..8a58519ee 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -858,6 +858,12 @@ static void do_job(hb_job_t *job) &vpp_settings[2], &vpp_settings[3], &vpp_settings[4], &vpp_settings[5]); } + // VPP crop/scale takes precedence over OpenCL scale too + if (job->use_opencl) + { + hb_release_opencl_run_env(); + job->use_opencl = 0; + } hb_list_rem(job->list_filter, filter); hb_filter_close(&filter); break; -- cgit v1.2.3