diff options
| author | John Stebbins <[email protected]> | 2019-09-11 09:56:06 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2019-09-12 10:22:07 -0700 |
| commit | 1b7948495fcf4d511e62d7f9c3a0c1a3ccb59f80 (patch) | |
| tree | c87c308f35d862678a4bca37637d24acb8de1c2c /libhb/qsv_memory.c | |
| parent | a7f548861f9f0be309659e93eaccd1994a3a5cfe (diff) | |
libhb: resolve header conflicts with pango/harfbuzz
Newest versions appear to have a "common.h" somewhere that is
interfering with libhb/common.h.
move headers into "handbrake" subdirectory
Diffstat (limited to 'libhb/qsv_memory.c')
| -rw-r--r-- | libhb/qsv_memory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libhb/qsv_memory.c b/libhb/qsv_memory.c index bb6c91a6c..625674910 100644 --- a/libhb/qsv_memory.c +++ b/libhb/qsv_memory.c @@ -26,13 +26,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \* ********************************************************************* */ -#include "project.h" +#include "handbrake/project.h" #if HB_PROJECT_FEATURE_QSV -#include "handbrake.h" -#include "hbffmpeg.h" -#include "qsv_memory.h" +#include "handbrake/handbrake.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/qsv_memory.h" int qsv_nv12_to_yuv420(struct SwsContext* sws_context,hb_buffer_t* dst, mfxFrameSurface1* src, mfxCoreInterface *core){ int ret = 0; |