summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/configure.ac8
-rw-r--r--gtk/module.defs4
-rw-r--r--gtk/src/audiohandler.c4
-rw-r--r--gtk/src/hb-backend.c6
-rw-r--r--gtk/src/standard_presets.xml24
5 files changed, 17 insertions, 29 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac
index 6c57e9851..6d0ecfce8 100644
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -60,10 +60,6 @@ AC_ARG_ENABLE(fdk-aac,
AS_HELP_STRING([--enable-fdk-aac], [enable fdk aac encoder]),
use_fdk_aac=yes, use_fdk_aac=no)
-AC_ARG_ENABLE(faac,
- AS_HELP_STRING([--enable-faac], [enable faac encoder]),
- use_faac=yes, use_faac=no)
-
AC_ARG_ENABLE(mp4v2,
AS_HELP_STRING([--enable-mp4v2], [enable mp4v2 muxer]),
use_mp4v2=yes, use_mp4v2=no)
@@ -192,10 +188,6 @@ if test "x$use_fdk_aac" = "xyes" ; then
HB_LIBS+=" -lfdk-aac"
fi
-if test "x$use_faac" = "xyes" ; then
- HB_LIBS+=" -lfaac"
-fi
-
if test "x$use_mp4v2" = "xyes" ; then
HB_LIBS+=" -lmp4v2"
fi
diff --git a/gtk/module.defs b/gtk/module.defs
index 33a5fd115..c23d74fc9 100644
--- a/gtk/module.defs
+++ b/gtk/module.defs
@@ -33,10 +33,6 @@ ifeq (1,$(FEATURE.fdk_aac))
GTK.CONFIGURE.extra += --enable-fdk-aac
endif
-ifeq (1,$(FEATURE.faac))
- GTK.CONFIGURE.extra += --enable-faac
-endif
-
ifeq (1,$(FEATURE.mp4v2))
GTK.CONFIGURE.extra += --enable-mp4v2
endif
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 24742f51d..1ab4987be 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -125,7 +125,7 @@ ghb_select_audio_codec(gint mux, hb_audio_config_t *aconfig, gint acodec, gint f
if ( mux & HB_MUX_MASK_MKV )
fallback = HB_ACODEC_LAME;
else
- fallback = HB_ACODEC_FAAC;
+ fallback = HB_ACODEC_FFAAC;
break;
}
}
@@ -183,7 +183,7 @@ int ghb_select_fallback(GValue *settings, int acodec)
return HB_ACODEC_LAME;
case HB_ACODEC_AAC_PASS:
- return HB_ACODEC_FAAC;
+ return HB_ACODEC_FFAAC;
case HB_ACODEC_AC3_PASS:
return HB_ACODEC_AC3;
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index c7b07481d..057625375 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -3369,7 +3369,7 @@ ghb_audio_can_passthru(gint acodec)
gint
ghb_get_default_acodec()
{
- return HB_ACODEC_FAAC;
+ return HB_ACODEC_FFAAC;
}
void
@@ -4128,7 +4128,7 @@ ghb_validate_audio(GValue *settings)
}
else
{
- codec = HB_ACODEC_FAAC;
+ codec = HB_ACODEC_FFAAC;
}
const char *name = hb_audio_encoder_get_short_name(codec);
ghb_settings_set_string(asettings, "AudioEncoder", name);
@@ -4142,7 +4142,7 @@ ghb_validate_audio(GValue *settings)
if (codec == HB_ACODEC_VORBIS)
{
a_unsup = "Vorbis";
- codec = HB_ACODEC_FAAC;
+ codec = HB_ACODEC_FFAAC;
}
}
if (a_unsup)
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 6fe8cb396..0d15877e3 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -24,7 +24,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -173,7 +173,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -306,7 +306,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -439,7 +439,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -572,7 +572,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -721,7 +721,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -870,7 +870,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -1019,7 +1019,7 @@
<key>AudioBitrate</key>
<string>128</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -1152,7 +1152,7 @@
<key>AudioBitrate</key>
<string>128</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -1285,7 +1285,7 @@
<key>AudioBitrate</key>
<string>128</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -1433,7 +1433,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
@@ -1566,7 +1566,7 @@
<key>AudioBitrate</key>
<string>160</string>
<key>AudioEncoder</key>
- <string>AAC (faac)</string>
+ <string>AAC (avcodec)</string>
<key>AudioMixdown</key>
<string>Dolby Pro Logic II</string>
<key>AudioSamplerate</key>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 15:45:19 +0000