From 1b7948495fcf4d511e62d7f9c3a0c1a3ccb59f80 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Wed, 11 Sep 2019 09:56:06 -0700 Subject: 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 --- libhb/audio_remap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libhb/audio_remap.c') diff --git a/libhb/audio_remap.c b/libhb/audio_remap.c index b480a69dd..e44a9572c 100644 --- a/libhb/audio_remap.c +++ b/libhb/audio_remap.c @@ -7,9 +7,9 @@ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#include "common.h" -#include "hbffmpeg.h" -#include "audio_remap.h" +#include "handbrake/common.h" +#include "handbrake/hbffmpeg.h" +#include "handbrake/audio_remap.h" // source: libavutil/channel_layout.h hb_chan_map_t hb_libav_chan_map = -- cgit v1.2.3