diff options
author | Rodeo <[email protected]> | 2015-07-04 22:56:15 +0000 |
---|---|---|
committer | Rodeo <[email protected]> | 2015-07-04 22:56:15 +0000 |
commit | 32363c86e5b1847289d9cc0dc741a5f536176225 (patch) | |
tree | 035791474fc36eb84d9b8fe2fefbb4547f90f15b /libhb/work.c | |
parent | a3bda1e2778f7741a125761c5ce38d33d5e16eba (diff) |
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
Diffstat (limited to 'libhb/work.c')
-rw-r--r-- | libhb/work.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |