summaryrefslogtreecommitdiffstats
path: root/libhb/encavcodec.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/encavcodec.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/encavcodec.c')
-rw-r--r--libhb/encavcodec.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index 99bf4010b..1c949249c 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -7,12 +7,12 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/
-#include "handbrake.h"
-#include "hb_dict.h"
-#include "hbffmpeg.h"
-#include "h264_common.h"
-#include "h265_common.h"
-#include "nal_units.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hb_dict.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/h264_common.h"
+#include "handbrake/h265_common.h"
+#include "handbrake/nal_units.h"
/*
* The frame info struct remembers information about each frame across calls