From: jstebbins <jstebbins.hb@gmail.com>
Date: Mon, 13 Sep 2010 16:28:23 +0000 (+0000)
Subject: LinGui: fix UI problem with trellis cavlc
X-Git-Tag: 0.9.5~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=427a2a77a298a9d5800f32bd8acaba63c33c3f9c;p=handbrake

LinGui: fix UI problem with trellis cavlc
forgot to remove some code that removed trellis from the option string when
cabac is disabled.


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

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 11be36eb8..72883d85a 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -1038,10 +1038,6 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
 	{
 		x264_remove_opt(split, x264_bpyramid_syns);
 	}
-	if (!ghb_settings_get_boolean(ud->settings, "x264_cabac"))
-	{
-		x264_remove_opt(split, x264_trellis_syns);
-	}
 	// Remove entries that match the defaults
 	for (ii = 0; split[ii] != NULL; ii++)
 	{