From 53a94cc365e81534a5f6ed7ee0649062372bcb05 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Wed, 17 Apr 2019 10:47:34 -0600 Subject: [PATCH] av_aac: use HB_PROJECT_FEATURE_FFMPEG_AAC instead of USE_FFMPEG_AAC --- libhb/common.c | 2 +- libhb/module.defs | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libhb/common.c b/libhb/common.c index b99fc9fa0..747b911fd 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -398,7 +398,7 @@ static int hb_audio_encoder_is_enabled(int encoder) return 1; #endif -#ifdef USE_FFMPEG_AAC +#if HB_PROJECT_FEATURE_FFMPEG_AAC case HB_ACODEC_FFAAC: return avcodec_find_encoder_by_name("aac") != NULL; #endif diff --git a/libhb/module.defs b/libhb/module.defs index 686e12798..3afda13dc 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -42,9 +42,6 @@ LIBHB.out += $(LIBHB.a) ############################################################################### -ifeq (1,$(FEATURE.ffmpeg_aac)) -LIBHB.GCC.D += USE_FFMPEG_AAC -endif LIBHB.GCC.D += __LIBHB__ USE_PTHREAD LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include -- 2.40.0