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/hb_json.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/hb_json.c')
| -rw-r--r-- | libhb/hb_json.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/hb_json.c b/libhb/hb_json.c index 5fb92b8b8..8ad0a720d 100644 --- a/libhb/hb_json.c +++ b/libhb/hb_json.c @@ -8,10 +8,10 @@ */ #include <jansson.h> -#include "handbrake.h" -#include "hb_json.h" +#include "handbrake/handbrake.h" +#include "handbrake/hb_json.h" #include "libavutil/base64.h" -#include "qsv_common.h" +#include "handbrake/qsv_common.h" /** * Convert an hb_state_t to a jansson dict |