diff options
| author | sr55 <[email protected]> | 2014-03-02 17:12:06 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-03-02 17:12:06 +0000 |
| commit | 3611993e93fc392bc50d926a3a91dafdf72d1c6c (patch) | |
| tree | 1cd3868399f19f1827190e33d365b9e51f04da9a /gtk/src | |
| parent | 66e23a8e096410d5f2584b43acc56c416db3f62e (diff) | |
Remove libfaac
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6094 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
| -rw-r--r-- | gtk/src/audiohandler.c | 4 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 6 | ||||
| -rw-r--r-- | gtk/src/standard_presets.xml | 24 |
3 files changed, 17 insertions, 17 deletions
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> |