diff options
| author | jstebbins <[email protected]> | 2009-12-09 19:59:49 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-12-09 19:59:49 +0000 |
| commit | 74ba2beb7054ef274c48dd95fd82d660e9cf51d2 (patch) | |
| tree | b43b7082b43bd1ff8a344badc1609ed1f674e77e | |
| parent | 8426cf2868de61bf8f688d549083a80e327ad1f8 (diff) | |
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
| -rw-r--r-- | gtk/src/widgetdeps.c | 1 | ||||
| -rw-r--r-- | gtk/src/x264handler.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/gtk/src/widgetdeps.c b/gtk/src/widgetdeps.c index 17502eba2..4e161fa51 100644 --- 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 2118349e5..e739bbbc4 100644 --- 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) { |