X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fx264handler.c;h=61adaa0b020822e82d1f9fe0a8d07945415e4869;hb=38411ed3d2e33bd434f7f255279924eba7c55e46;hp=a46641203a6b1c09d7cc9959ef834a879cc60c71;hpb=ea7897433ef5c5785661d0615e0cd17f9455792d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index a4664120..61adaa0b 100644
--- 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