Changeset 32363c8


Ignore:
Timestamp:
07/04/15 22:56:15 (10 months ago)
Author:
Rodeo <tdskywalker@…>
Branches:
master
Children:
e32a468
Parents:
a3bda1e
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libhb/work.c

    r293083e r32363c8  
    858858                                   &vpp_settings[2], &vpp_settings[3],
    859859                                   &vpp_settings[4], &vpp_settings[5]);
     860                        }
     861                        // VPP crop/scale takes precedence over OpenCL scale too
     862                        if (job->use_opencl)
     863                        {
     864                            hb_release_opencl_run_env();
     865                            job->use_opencl = 0;
    860866                        }
    861867                        hb_list_rem(job->list_filter, filter);
Note: See TracChangeset for help on using the changeset viewer.