LinGui: add option to completely disable update checking

[handbrake-jp/handbrake-jp-git.git] / gtk / src / x264handler.c

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index a466412..61adaa0 100644 (file)
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -523,7 +523,7 @@ static void
 x264_opt_update(signal_user_data_t *ud, GtkWidget *widget)
 {
        gint jj;
-       const gchar *name = gtk_widget_get_name(widget);
+       const gchar *name = ghb_get_setting_key(widget);
        gchar **opt_syns = NULL;
        const gchar *def_val = NULL;
        gint type;
@@ -819,11 +819,6 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
        gint ii;
 
        // Fix up option dependencies
-       gboolean mbtree = ghb_lookup_mbtree(options);
-       if (mbtree)
-       {
-               x264_remove_opt(split, x264_bpyramid_syns);
-       }
        gint subme = ghb_settings_combo_int(ud->settings, "x264_subme");
        if (subme < 6)
        {
@@ -893,14 +888,7 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
                        val = "1";
                }
                const gchar *def_val;
-               if (find_syn_match(opt, x264_mbtree_syns) >= 0 && bframes == 0)
-               {
-                       def_val = "0";
-               }
-               else
-               {
-                       def_val = x264_opt_get_default(opt);
-               }
+               def_val = x264_opt_get_default(opt);
                if (strcmp(val, def_val) == 0)
                {
                        // Matches the default, so remove it