diff options
| author | jstebbins <[email protected]> | 2011-06-08 18:28:55 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-06-08 18:28:55 +0000 |
| commit | 2a262093e255a22c3c38c9c676b37c44a1abb085 (patch) | |
| tree | 2ca8b4d096c0ca3412d46f9d3c2f3286ae4eefb5 /gtk/src | |
| parent | 1e92c150aac42a8cd6e8c12b10494d9a1f42796e (diff) | |
Add ffaac encode support
Adds "AAC (ffmpeg)" option to lingui and macui, "ffaac" option to cli.
Does not yet remove faac.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4031 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
| -rw-r--r-- | gtk/src/hb-backend.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 39c8cbd70..df909c1b9 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -252,6 +252,7 @@ combo_opts_t vcodec_opts = static options_map_t d_acodec_opts[] = { {"AAC (faac)", "faac", HB_ACODEC_FAAC, "faac"}, + {"AAC (ffmpeg)", "ffaac", HB_ACODEC_FFAAC, "ffaac"}, {"MP3 (lame)", "lame", HB_ACODEC_LAME, "lame"}, {"Vorbis", "vorbis", HB_ACODEC_VORBIS, "vorbis"}, {"AC3 (ffmpeg)", "ac3", HB_ACODEC_AC3, "ac3"}, @@ -1555,6 +1556,7 @@ ghb_grey_combo_options(GtkBuilder *builder) ghb_value_free(gval); grey_combo_box_item(builder, "x264_analyse", 4, TRUE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FFAAC, FALSE); grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, FALSE); grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, FALSE); grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, FALSE); @@ -4145,6 +4147,10 @@ ghb_select_audio_codec(GValue *settings, hb_audio_config_t *aconfig, gint acodec { return HB_ACODEC_FAAC; } + else if (acodec & HB_ACODEC_FFAAC) + { + return HB_ACODEC_FFAAC; + } else { return HB_ACODEC_FAAC; @@ -4172,6 +4178,10 @@ ghb_select_audio_codec(GValue *settings, hb_audio_config_t *aconfig, gint acodec { return HB_ACODEC_FAAC; } + else if (acodec & HB_ACODEC_FFAAC) + { + return HB_ACODEC_FFAAC; + } else { return HB_ACODEC_LAME; |