diff options
| author | John Stebbins <[email protected]> | 2019-09-09 13:35:45 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2019-09-10 09:17:18 -0700 |
| commit | 294bb35fc36b6cb948eaec55c2cfb8b1528d93a7 (patch) | |
| tree | 5b3460b89054cffeff6dd8138d0478fafc4de326 /libhb/qsv_common.c | |
| parent | e88c6d5b7aa709f6c76f94c26bf6ac60d5f2dc12 (diff) | |
Resolve conflict with harfbuzz include file hb.h
Rename hb.h to handbrake.h
Diffstat (limited to 'libhb/qsv_common.c')
| -rw-r--r-- | libhb/qsv_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c index b13fcbd96..9f7762159 100644 --- a/libhb/qsv_common.c +++ b/libhb/qsv_common.c @@ -14,7 +14,7 @@ #include <stdio.h> #include <string.h> -#include "hb.h" +#include "handbrake.h" #include "ports.h" #include "common.h" #include "hb_dict.h" @@ -2279,7 +2279,7 @@ void hb_qsv_force_workarounds() #undef FORCE_WORKAROUNDS } -#include "hb.h" +#include "handbrake.h" #include "hbffmpeg.h" #include "libavfilter/avfilter.h" #include "libavfilter/buffersrc.h" |