From 8a354a757bafb792b5189367e29cbda9a193f2b6 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Wed, 11 Sep 2019 11:35:50 -0700 Subject: libhb: avoid harfbuzz header barrier collisions harfbuz prefixes header barriers with HB_* which conflicts with some of handbrakes header barriers. So use prefix HANDBRAKE_* for all of our headers. --- libhb/handbrake/qsv_libav.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libhb/handbrake/qsv_libav.h') diff --git a/libhb/handbrake/qsv_libav.h b/libhb/handbrake/qsv_libav.h index b74b50c2b..75b32db90 100644 --- a/libhb/handbrake/qsv_libav.h +++ b/libhb/handbrake/qsv_libav.h @@ -26,8 +26,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \* ********************************************************************* */ -#ifndef HB_QSV_LIBAV_H -#define HB_QSV_LIBAV_H +#ifndef HANDBRAKE_QSV_LIBAV_H +#define HANDBRAKE_QSV_LIBAV_H /** * @file @@ -478,4 +478,4 @@ void *hb_qsv_list_item(hb_qsv_list *, int); /* @} */ -#endif // HB_QSV_LIBAV_H +#endif // HANDBRAKE_QSV_LIBAV_H -- cgit v1.2.3