LinGui: remove b-pyramid/mbtree dependency

b-pyramid is now allowed with mbtree

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3021 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/widgetdeps.c b/gtk/src/widgetdeps.c
index 17502eba26b224ba433e4d791377ebd462b17dbd..4e161fa5133b5f22df72b117ec9ab07884de9c12 100644 (file)
--- a/gtk/src/widgetdeps.c
+++ b/gtk/src/widgetdeps.c
@@ -69,7 +69,6 @@ static dependency_t dep_map[] =
        {"x264_subme", "x264_psy_trell", "<6", TRUE, FALSE},
        {"x264_cabac", "x264_psy_trell", "TRUE", FALSE, FALSE},
        {"x264_trellis", "x264_psy_trell", "0", TRUE, FALSE},
-       {"x264_mbtree", "x264_bpyramid", "TRUE", TRUE, FALSE},
        {"ChapterMarkers", "chapters_list", "TRUE", FALSE, FALSE},
        {"use_source_name", "chapters_in_destination", "TRUE", FALSE, FALSE},
        {"use_source_name", "title_no_in_destination", "TRUE", FALSE, FALSE},

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 2118349e57a0b88b16158cac6ea6a6aec3a90ac7..e739bbbc4dfc9be8f1e5d860436501ac3e9ab059 100644 (file)
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -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)
        {