From: Rodeo <tdskywalker@gmail.com>
Date: Sat, 4 Jul 2015 23:18:41 +0000 (+0000)
Subject: [merge] libhb: disable OpenCL scaling when QSV scaling is used.
X-Git-Tag: 0.10.3~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46219fac2b20068b7a154899d7f0ccfdd64c848e;p=handbrake

[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 c889f14ad..58a0e61eb 100644
--- 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;