summaryrefslogtreecommitdiffstats
path: root/libhb/common.c
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2019-09-11 09:56:06 -0700
committerJohn Stebbins <[email protected]>2019-09-12 10:22:07 -0700
commit1b7948495fcf4d511e62d7f9c3a0c1a3ccb59f80 (patch)
treec87c308f35d862678a4bca37637d24acb8de1c2c /libhb/common.c
parenta7f548861f9f0be309659e93eaccd1994a3a5cfe (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/common.c')
-rw-r--r--libhb/common.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libhb/common.c b/libhb/common.c
index a3edef84a..f7fb9dbb5 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -12,15 +12,15 @@
#include <ctype.h>
#include <sys/time.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
#include "x264.h"
-#include "lang.h"
-#include "common.h"
-#include "h264_common.h"
-#include "h265_common.h"
-#include "encx264.h"
+#include "handbrake/lang.h"
+#include "handbrake/common.h"
+#include "handbrake/h264_common.h"
+#include "handbrake/h265_common.h"
+#include "handbrake/encx264.h"
#if HB_PROJECT_FEATURE_QSV
-#include "qsv_common.h"
+#include "handbrake/qsv_common.h"
#endif
#if HB_PROJECT_FEATURE_X265
@@ -32,10 +32,10 @@
#endif
#if HB_PROJECT_FEATURE_NVENC
-#include "nvenc_common.h"
+#include "handbrake/nvenc_common.h"
#endif
#if HB_PROJECT_FEATURE_VCE
-#include "vce_common.h"
+#include "handbrake/vce_common.h"
#endif
#ifdef __APPLE__