LinGui: vfr checkbox is toast.

detelecine && same-as-source now triggers vfr


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

10 files changed, 16 insertions, 305 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 98b107b26..a1babd4d6 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1372,20 +1372,6 @@ vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
 }
 
-void
-vfr_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-	//const gchar *name = gtk_widget_get_name(widget);
-	//g_debug("setting_widget_changed_cb () %s", name);
-	ghb_widget_to_setting(ud->settings, widget);
-	check_dependency(ud, widget);
-	clear_presets_selection(ud);
-	if (ghb_settings_get_boolean(ud->settings, "variable_frame_rate"))
-	{
-		ghb_ui_update(ud, "framerate", ghb_int64_value(0));
-	}
-}
-
 // subtitles have their differ from other settings in that
 // the selection is updated automaitcally when the title
 // changes.  I don't want the preset selection changed as
@@ -4486,7 +4472,7 @@ gboolean queue_key_press_cb(
 	GValue *settings;
 	gint status;
 
-	g_message("queue_key_press_cb ()");
+	g_debug("queue_key_press_cb ()");
 	treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
 	store = gtk_tree_view_get_model(treeview);
 
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index dfc4430fb..4bb77a598 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -1703,21 +1703,6 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="variable_frame_rate">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="label" translatable="yes">Variable Frame Rate</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="vfr_changed_cb" name="toggled"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
                                       <object class="GtkCheckButton" id="two_pass">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -1727,7 +1712,7 @@
                                         <signal handler="setting_widget_changed_cb" name="toggled"/>
                                       </object>
                                       <packing>
-                                        <property name="position">3</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1748,7 +1733,7 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="position">4</property>
+                                        <property name="position">3</property>
                                       </packing>
                                     </child>
                                     <child>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 1471181ba..3959dce89 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -2645,22 +2645,6 @@ ghb_validate_video(signal_user_data_t *ud)
 		vcodec = HB_VCODEC_XVID;
 		ghb_ui_update(ud, "video_codec", ghb_int64_value(vcodec));
 	}
-	gboolean decomb;
-   	gboolean vfr;
-	decomb = ghb_settings_get_boolean(ud->settings, "decomb");
-	vfr = ghb_settings_get_boolean(ud->settings, "variable_frame_rate");
-	if (decomb && !vfr)
-	{
-		message = g_strdup_printf(
-					"Decomb is intended to be used in conjunction\n"
-					"with variable frame rate.\n\n"
-					"Would you like me to enable VFR for you?");
-		if (ghb_message_dialog(GTK_MESSAGE_WARNING, message, "No", "Yes"))
-		{
-			ghb_ui_update(ud, "variable_frame_rate", ghb_boolean_value(TRUE));
-		}
-		g_free(message);
-	}
 	return TRUE;
 }
 
@@ -3089,10 +3073,15 @@ ghb_add_job(GValue *js, gint unique_id)
 		job->pixel_ratio = 0;
 		job->modulus = 2;
 	}
-   	job->vfr = ghb_settings_get_boolean(js, "variable_frame_rate");
 	/* Add selected filters */
 	job->filters = hb_list_init();
-	if( ghb_settings_get_boolean(js, "detelecine" ) || job->vfr )
+	gint vrate = ghb_settings_combo_int(js, "framerate");
+	if( vrate == 0 && ghb_settings_get_boolean(js, "detelecine" ) )
+		job->vfr = 1;
+	else
+		job->vfr = 0;
+
+	if( ghb_settings_get_boolean(js, "detelecine" ) )
 	{
 		hb_filter_detelecine.settings = NULL;
 		if (tweaks)
@@ -3204,10 +3193,10 @@ ghb_add_job(GValue *js, gint unique_id)
 	if (job->mux == HB_MUX_AVI)
 	{
 		job->vfr = FALSE;
+		job->cfr = 1;
 	}
 
-	gint vrate = ghb_settings_combo_int(js, "framerate");
-	if( vrate == 0 || job->vfr )
+	if( vrate == 0 )
 	{
 		job->vrate = title->rate;
 		job->vrate_base = title->rate_base;
diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index 7b7842007..ed66ec15c 100644
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -174,8 +174,6 @@
 		<string></string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<true />
 		<key>video_bitrate</key>
 		<integer>1800</integer>
 		<key>video_codec</key>
diff --git a/gtk/src/makedeps.c b/gtk/src/makedeps.c
index e3460ef14..433068a7e 100644
--- a/gtk/src/makedeps.c
+++ b/gtk/src/makedeps.c
@@ -37,9 +37,6 @@ static dependency_t dep_map[] =
 	{"container", "large_mp4", "mp4|m4v", FALSE},
 	{"container", "http_optimize_mp4", "mp4|m4v", FALSE},
 	{"container", "ipod_file", "mp4|m4v", FALSE},
-	{"container", "variable_frame_rate", "avi", TRUE},
-	{"variable_frame_rate", "framerate", "TRUE", TRUE},
-	{"variable_frame_rate", "detelecine", "TRUE", TRUE},
 	{"decomb", "deinterlace", "TRUE", TRUE},
 	{"decomb", "tweak_deinterlace", "TRUE", TRUE},
 	{"autocrop", "crop_top", "FALSE", FALSE},
diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 88f54d16f..490dc8bd7 100644
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -2696,33 +2696,6 @@
 "                                    &lt;/child&gt;\n"
 "                                    &lt;child&gt;\n"
 "                                      &lt;object class=&quot;GtkCheckBu"
-"tton&quot; id=&quot;variable_frame_rate&quot;&gt;\n"
-"                                        &lt;property name=&quot;visible"
-"&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;can_foc"
-"us&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;events&"
-"quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;label&q"
-"uot; translatable=&quot;yes&quot;&gt;Variable Frame Rate&lt;/property&g"
-"t;\n"
-"                                        &lt;property name=&quot;active&"
-"quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;draw_in"
-"dicator&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;signal handler=&quot;vfr_ch"
-"anged_cb&quot; name=&quot;toggled&quot;/&gt;\n"
-"                                      &lt;/object&gt;\n"
-"                                      &lt;packing&gt;\n"
-"                                        &lt;property name=&quot;expand&"
-"quot;&gt;False&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;positio"
-"n&quot;&gt;2&lt;/property&gt;\n"
-"                                      &lt;/packing&gt;\n"
-"                                    &lt;/child&gt;\n"
-"                                    &lt;child&gt;\n"
-"                                      &lt;object class=&quot;GtkCheckBu"
 "tton&quot; id=&quot;two_pass&quot;&gt;\n"
 "                                        &lt;property name=&quot;visible"
 "&quot;&gt;True&lt;/property&gt;\n"
@@ -2740,7 +2713,7 @@
 "                                      &lt;/object&gt;\n"
 "                                      &lt;packing&gt;\n"
 "                                        &lt;property name=&quot;positio"
-"n&quot;&gt;3&lt;/property&gt;\n"
+"n&quot;&gt;2&lt;/property&gt;\n"
 "                                      &lt;/packing&gt;\n"
 "                                    &lt;/child&gt;\n"
 "                                    &lt;child&gt;\n"
@@ -2777,7 +2750,7 @@
 "                                      &lt;/object&gt;\n"
 "                                      &lt;packing&gt;\n"
 "                                        &lt;property name=&quot;positio"
-"n&quot;&gt;4&lt;/property&gt;\n"
+"n&quot;&gt;3&lt;/property&gt;\n"
 "                                      &lt;/packing&gt;\n"
 "                                    &lt;/child&gt;\n"
 "                                    &lt;child&gt;\n"
@@ -10127,8 +10100,6 @@
 "			<string></string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<true />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1800</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10207,8 +10178,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1000</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10293,8 +10262,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>2500</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10368,8 +10335,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1800</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10443,8 +10408,6 @@
 "			<false />\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>512</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10517,8 +10480,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1600</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10589,8 +10550,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1000</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10663,8 +10622,6 @@
 "			<false />\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>2000</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10739,8 +10696,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1600</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10812,8 +10767,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1800</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10886,8 +10839,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1500</integer>\n"
 "			<key>video_codec</key>\n"
@@ -10955,8 +10906,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>2500</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11026,8 +10975,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1024</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11100,8 +11047,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>2000</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11174,8 +11119,6 @@
 "			<true />\n"
 "			<key>two_pass</key>\n"
 "			<true />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1300</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11244,8 +11187,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>2000</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11319,8 +11260,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>960</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11393,8 +11332,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>1500</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11468,8 +11405,6 @@
 "			<string>none</string>\n"
 "			<key>two_pass</key>\n"
 "			<false />\n"
-"			<key>variable_frame_rate</key>\n"
-"			<false />\n"
 "			<key>video_bitrate</key>\n"
 "			<integer>700</integer>\n"
 "			<key>video_codec</key>\n"
@@ -11520,7 +11455,6 @@
 "			<string>large_mp4</string>\n"
 "			<string>http_optimize_mp4</string>\n"
 "			<string>ipod_file</string>\n"
-"			<string>variable_frame_rate</string>\n"
 "		</array>\n"
 "		<key>decomb</key>\n"
 "		<array>\n"
@@ -11554,11 +11488,6 @@
 "		<array>\n"
 "			<string>chapters_in_destination</string>\n"
 "		</array>\n"
-"		<key>variable_frame_rate</key>\n"
-"		<array>\n"
-"			<string>framerate</string>\n"
-"			<string>detelecine</string>\n"
-"		</array>\n"
 "		<key>video_codec</key>\n"
 "		<array>\n"
 "			<string>x264_tab</string>\n"
@@ -11723,14 +11652,6 @@
 "				<true />\n"
 "			</array>\n"
 "		</array>\n"
-"		<key>detelecine</key>\n"
-"		<array>\n"
-"			<array>\n"
-"				<string>variable_frame_rate</string>\n"
-"				<string>TRUE</string>\n"
-"				<true />\n"
-"			</array>\n"
-"		</array>\n"
 "		<key>end_chapter</key>\n"
 "		<array>\n"
 "			<array>\n"
@@ -11739,14 +11660,6 @@
 "				<true />\n"
 "			</array>\n"
 "		</array>\n"
-"		<key>framerate</key>\n"
-"		<array>\n"
-"			<array>\n"
-"				<string>variable_frame_rate</string>\n"
-"				<string>TRUE</string>\n"
-"				<true />\n"
-"			</array>\n"
-"		</array>\n"
 "		<key>http_optimize_mp4</key>\n"
 "		<array>\n"
 "			<array>\n"
@@ -11911,14 +11824,6 @@
 "				<true />\n"
 "			</array>\n"
 "		</array>\n"
-"		<key>variable_frame_rate</key>\n"
-"		<array>\n"
-"			<array>\n"
-"				<string>container</string>\n"
-"				<string>avi</string>\n"
-"				<true />\n"
-"			</array>\n"
-"		</array>\n"
 "		<key>video_bitrate</key>\n"
 "		<array>\n"
 "			<array>\n"
diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index b9319ef07..559709c12 100644
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -1708,21 +1708,6 @@
                                       &lt;/packing&gt;
                                     &lt;/child&gt;
                                     &lt;child&gt;
-                                      &lt;object class=&quot;GtkCheckButton&quot; id=&quot;variable_frame_rate&quot;&gt;
-                                        &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
-                                        &lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
-                                        &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
-                                        &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Variable Frame Rate&lt;/property&gt;
-                                        &lt;property name=&quot;active&quot;&gt;True&lt;/property&gt;
-                                        &lt;property name=&quot;draw_indicator&quot;&gt;True&lt;/property&gt;
-                                        &lt;signal handler=&quot;vfr_changed_cb&quot; name=&quot;toggled&quot;/&gt;
-                                      &lt;/object&gt;
-                                      &lt;packing&gt;
-                                        &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
-                                        &lt;property name=&quot;position&quot;&gt;2&lt;/property&gt;
-                                      &lt;/packing&gt;
-                                    &lt;/child&gt;
-                                    &lt;child&gt;
                                       &lt;object class=&quot;GtkCheckButton&quot; id=&quot;two_pass&quot;&gt;
                                         &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
                                         &lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
@@ -1732,7 +1717,7 @@
                                         &lt;signal handler=&quot;setting_widget_changed_cb&quot; name=&quot;toggled&quot;/&gt;
                                       &lt;/object&gt;
                                       &lt;packing&gt;
-                                        &lt;property name=&quot;position&quot;&gt;3&lt;/property&gt;
+                                        &lt;property name=&quot;position&quot;&gt;2&lt;/property&gt;
                                       &lt;/packing&gt;
                                     &lt;/child&gt;
                                     &lt;child&gt;
@@ -1753,7 +1738,7 @@
                                         &lt;/child&gt;
                                       &lt;/object&gt;
                                       &lt;packing&gt;
-                                        &lt;property name=&quot;position&quot;&gt;4&lt;/property&gt;
+                                        &lt;property name=&quot;position&quot;&gt;3&lt;/property&gt;
                                       &lt;/packing&gt;
                                     &lt;/child&gt;
                                     &lt;child&gt;
@@ -5003,8 +4988,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string></string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<true />
 			<key>video_bitrate</key>
 			<integer>1800</integer>
 			<key>video_codec</key>
@@ -5082,8 +5065,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1000</integer>
 			<key>video_codec</key>
@@ -5164,8 +5145,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>2500</integer>
 			<key>video_codec</key>
@@ -5236,8 +5215,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1800</integer>
 			<key>video_codec</key>
@@ -5308,8 +5285,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<false />
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>512</integer>
 			<key>video_codec</key>
@@ -5380,8 +5355,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1600</integer>
 			<key>video_codec</key>
@@ -5450,8 +5423,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1000</integer>
 			<key>video_codec</key>
@@ -5522,8 +5493,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<false />
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>2000</integer>
 			<key>video_codec</key>
@@ -5594,8 +5563,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1600</integer>
 			<key>video_codec</key>
@@ -5666,8 +5633,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1800</integer>
 			<key>video_codec</key>
@@ -5738,8 +5703,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1500</integer>
 			<key>video_codec</key>
@@ -5806,8 +5769,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>2500</integer>
 			<key>video_codec</key>
@@ -5876,8 +5837,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1024</integer>
 			<key>video_codec</key>
@@ -5948,8 +5907,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>2000</integer>
 			<key>video_codec</key>
@@ -6020,8 +5977,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<true />
 			<key>two_pass</key>
 			<true />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1300</integer>
 			<key>video_codec</key>
@@ -6088,8 +6043,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>2000</integer>
 			<key>video_codec</key>
@@ -6160,8 +6113,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>960</integer>
 			<key>video_codec</key>
@@ -6232,8 +6183,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>1500</integer>
 			<key>video_codec</key>
@@ -6304,8 +6253,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>none</string>
 			<key>two_pass</key>
 			<false />
-			<key>variable_frame_rate</key>
-			<false />
 			<key>video_bitrate</key>
 			<integer>700</integer>
 			<key>video_codec</key>
@@ -6355,7 +6302,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>large_mp4</string>
 			<string>http_optimize_mp4</string>
 			<string>ipod_file</string>
-			<string>variable_frame_rate</string>
 		</array>
 		<key>decomb</key>
 		<array>
@@ -6389,11 +6335,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 		<array>
 			<string>chapters_in_destination</string>
 		</array>
-		<key>variable_frame_rate</key>
-		<array>
-			<string>framerate</string>
-			<string>detelecine</string>
-		</array>
 		<key>video_codec</key>
 		<array>
 			<string>x264_tab</string>
@@ -6558,14 +6499,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 				<true />
 			</array>
 		</array>
-		<key>detelecine</key>
-		<array>
-			<array>
-				<string>variable_frame_rate</string>
-				<string>TRUE</string>
-				<true />
-			</array>
-		</array>
 		<key>end_chapter</key>
 		<array>
 			<array>
@@ -6574,14 +6507,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 				<true />
 			</array>
 		</array>
-		<key>framerate</key>
-		<array>
-			<array>
-				<string>variable_frame_rate</string>
-				<string>TRUE</string>
-				<true />
-			</array>
-		</array>
 		<key>http_optimize_mp4</key>
 		<array>
 			<array>
@@ -6746,14 +6671,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 				<true />
 			</array>
 		</array>
-		<key>variable_frame_rate</key>
-		<array>
-			<array>
-				<string>container</string>
-				<string>avi</string>
-				<true />
-			</array>
-		</array>
 		<key>video_bitrate</key>
 		<array>
 			<array>
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 46a78ff5f..37fc524da 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -59,8 +59,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1000</integer>
 		<key>video_codec</key>
@@ -141,8 +139,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>2500</integer>
 		<key>video_codec</key>
@@ -213,8 +209,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1800</integer>
 		<key>video_codec</key>
@@ -285,8 +279,6 @@
 		<false />
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>512</integer>
 		<key>video_codec</key>
@@ -357,8 +349,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1600</integer>
 		<key>video_codec</key>
@@ -427,8 +417,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1000</integer>
 		<key>video_codec</key>
@@ -499,8 +487,6 @@
 		<false />
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>2000</integer>
 		<key>video_codec</key>
@@ -571,8 +557,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1600</integer>
 		<key>video_codec</key>
@@ -643,8 +627,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1800</integer>
 		<key>video_codec</key>
@@ -715,8 +697,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1500</integer>
 		<key>video_codec</key>
@@ -783,8 +763,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>2500</integer>
 		<key>video_codec</key>
@@ -853,8 +831,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1024</integer>
 		<key>video_codec</key>
@@ -925,8 +901,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>2000</integer>
 		<key>video_codec</key>
@@ -997,8 +971,6 @@
 		<true />
 		<key>two_pass</key>
 		<true />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1300</integer>
 		<key>video_codec</key>
@@ -1065,8 +1037,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>2000</integer>
 		<key>video_codec</key>
@@ -1137,8 +1107,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>960</integer>
 		<key>video_codec</key>
@@ -1209,8 +1177,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>1500</integer>
 		<key>video_codec</key>
@@ -1281,8 +1247,6 @@
 		<string>none</string>
 		<key>two_pass</key>
 		<false />
-		<key>variable_frame_rate</key>
-		<false />
 		<key>video_bitrate</key>
 		<integer>700</integer>
 		<key>video_codec</key>
diff --git a/gtk/src/widget_deps b/gtk/src/widget_deps
index 858175ad4..001202718 100644
--- a/gtk/src/widget_deps
+++ b/gtk/src/widget_deps
@@ -35,7 +35,6 @@
 		<string>large_mp4</string>
 		<string>http_optimize_mp4</string>
 		<string>ipod_file</string>
-		<string>variable_frame_rate</string>
 	</array>
 	<key>decomb</key>
 	<array>
@@ -69,11 +68,6 @@
 	<array>
 		<string>chapters_in_destination</string>
 	</array>
-	<key>variable_frame_rate</key>
-	<array>
-		<string>framerate</string>
-		<string>detelecine</string>
-	</array>
 	<key>video_codec</key>
 	<array>
 		<string>x264_tab</string>
diff --git a/gtk/src/widget_reverse_deps b/gtk/src/widget_reverse_deps
index fb269261f..25cd55fb7 100644
--- a/gtk/src/widget_reverse_deps
+++ b/gtk/src/widget_reverse_deps
@@ -114,14 +114,6 @@
 			<true />
 		</array>
 	</array>
-	<key>detelecine</key>
-	<array>
-		<array>
-			<string>variable_frame_rate</string>
-			<string>TRUE</string>
-			<true />
-		</array>
-	</array>
 	<key>end_chapter</key>
 	<array>
 		<array>
@@ -130,14 +122,6 @@
 			<true />
 		</array>
 	</array>
-	<key>framerate</key>
-	<array>
-		<array>
-			<string>variable_frame_rate</string>
-			<string>TRUE</string>
-			<true />
-		</array>
-	</array>
 	<key>http_optimize_mp4</key>
 	<array>
 		<array>
@@ -302,14 +286,6 @@
 			<true />
 		</array>
 	</array>
-	<key>variable_frame_rate</key>
-	<array>
-		<array>
-			<string>container</string>
-			<string>avi</string>
-			<true />
-		</array>
-	</array>
 	<key>video_bitrate</key>
 	<array>
 		<array>