[merge] libhb: disable OpenCL scaling when QSV scaling is used.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@7346 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/work.c b/libhb/work.c
index c889f14ad1981e5e4ca82639fc39b0561e28690a..58a0e61eb97c3aa263f4037ce3891958c92e0e23 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -813,6 +813,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;