diff options
| author | jstebbins <[email protected]> | 2008-10-09 18:35:55 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2008-10-09 18:35:55 +0000 |
| commit | f63cfb81c8a7e3eba6ca68c7399cece5f57bbb3c (patch) | |
| tree | b1b07b86003cc7013bf983797c21a5264f1a4c32 /gtk/src/x264handler.c | |
| parent | e4e23f4271c0cc4d004d0b54a67664c87affa27c (diff) | |
LinGui: Changes required by latest x264
Loose b-rdo and bime options. Allow subme to go to 9.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1823 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/x264handler.c')
| -rw-r--r-- | gtk/src/x264handler.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c index 8f8576c94..1ff2c414c 100644 --- a/gtk/src/x264handler.c +++ b/gtk/src/x264handler.c @@ -111,8 +111,6 @@ static gchar *x264_bframes_syns[] = {"bframes", NULL}; static gchar *x264_direct_syns[] = {"direct", "direct-pred", "direct_pred", NULL}; static gchar *x264_weightb_syns[] = {"weightb", "weight-b", "weight_b", NULL}; -static gchar *x264_brdo_syns[] = {"brdo", "b-rdo", "b_rdo", NULL}; -static gchar *x264_bime_syns[] = {"bime", NULL}; static gchar *x264_bpyramid_syns[] = {"b-pyramid", "b_pyramid", NULL}; static gchar *x264_me_syns[] = {"me", NULL}; static gchar *x264_merange_syns[] = {"merange", "me-range", "me_range", NULL}; @@ -145,8 +143,6 @@ struct x264_opt_map_s x264_opt_map[] = {x264_bframes_syns, "x264_bframes", "0", X264_OPT_INT}, {x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO}, {x264_weightb_syns, "x264_weighted_bframes", "0", X264_OPT_BOOL}, - {x264_brdo_syns, "x264_brdo", "0", X264_OPT_BOOL}, - {x264_bime_syns, "x264_bime", "0", X264_OPT_BOOL}, {x264_bpyramid_syns, "x264_bpyramid", "0", X264_OPT_BOOL}, {x264_me_syns, "x264_me", "hex", X264_OPT_COMBO}, {x264_merange_syns, "x264_merange", "16", X264_OPT_INT}, @@ -575,19 +571,10 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options) { x264_remove_opt(split, x264_mixed_syns); } - gint subme; - - subme = ghb_settings_combo_int(ud->settings, "x264_subme"); - if (subme < 6) - { - x264_remove_opt(split, x264_brdo_syns); - } gint bframes = ghb_settings_get_int(ud->settings, "x264_bframes"); if (bframes == 0) { x264_remove_opt(split, x264_weightb_syns); - x264_remove_opt(split, x264_brdo_syns); - x264_remove_opt(split, x264_bime_syns); x264_remove_opt(split, x264_direct_syns); } if (bframes <= 1) |