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/nlmeans_x86.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/nlmeans_x86.c')
-rw-r--r-- | libhb/nlmeans_x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libhb/nlmeans_x86.c b/libhb/nlmeans_x86.c index 131b81007..423fa50e4 100644 --- a/libhb/nlmeans_x86.c +++ b/libhb/nlmeans_x86.c @@ -8,14 +8,14 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "handbrake.h" // needed for ARCH_X86 +#include "handbrake/handbrake.h" // needed for ARCH_X86 #if defined(ARCH_X86) #include <emmintrin.h> #include "libavutil/cpu.h" -#include "nlmeans.h" +#include "handbrake/nlmeans.h" static void build_integral_sse2(uint32_t *integral, int integral_stride, |