diff options
| author | John Stebbins <[email protected]> | 2019-09-11 11:35:50 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2019-09-12 10:25:54 -0700 |
| commit | 8a354a757bafb792b5189367e29cbda9a193f2b6 (patch) | |
| tree | 2fcc8222fa020443a6f671d12feb4a833e1fc2bd /libhb/handbrake/hbffmpeg.h | |
| parent | 89dbcaf6c5d02169f1f9472dc64583a0b814fdc4 (diff) | |
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.
Diffstat (limited to 'libhb/handbrake/hbffmpeg.h')
| -rw-r--r-- | libhb/handbrake/hbffmpeg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/handbrake/hbffmpeg.h b/libhb/handbrake/hbffmpeg.h index 6357dcd9c..8612f12d7 100644 --- a/libhb/handbrake/hbffmpeg.h +++ b/libhb/handbrake/hbffmpeg.h @@ -7,8 +7,8 @@ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html */ -#ifndef HB_FFMPEG_H -#define HB_FFMPEG_H +#ifndef HANDBRAKE_FFMPEG_H +#define HANDBRAKE_FFMPEG_H #include "libavcodec/avcodec.h" #include "libavformat/avformat.h" @@ -59,4 +59,4 @@ int hb_av_encoder_present(int encoder); const char* const* hb_av_profile_get_names(int encoder); const char* const* hb_av_level_get_names(int encoder); -#endif +#endif // HANDBRAKE_FFMPEG_H |