OSDN Git Service

LinGui: fix UI problem with trellis cavlc
authorjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 13 Sep 2010 16:28:23 +0000 (16:28 +0000)
committerjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 13 Sep 2010 16:28:23 +0000 (16:28 +0000)
forgot to remove some code that removed trellis from the option string when
cabac is disabled.

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

gtk/src/x264handler.c

index 11be36e..72883d8 100644 (file)
@@ -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++)
        {