X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fwidgetdeps.c;h=17502eba26b224ba433e4d791377ebd462b17dbd;hb=bade7b5f6eaf40ffffa17480be77471183ef0a68;hp=481cbf0ec6ca328f4729b14d8b407e6683e4a6fd;hpb=e49ced19c751a37ad6f5e07f0051d93ba8eb4965;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/widgetdeps.c b/gtk/src/widgetdeps.c
index 481cbf0e..17502eba 100644
--- a/gtk/src/widgetdeps.c
+++ b/gtk/src/widgetdeps.c
@@ -18,8 +18,6 @@ static dependency_t dep_map[] =
 {
 	{"title", "queue_add", "none", TRUE, FALSE},
 	{"title", "queue_add_menu", "none", TRUE, FALSE},
-	{"title", "show_picture", "none", TRUE, FALSE},
-	{"title", "show_preview_menu", "none", TRUE, FALSE},
 	{"title", "preview_frame", "none", TRUE, FALSE},
 	{"title", "picture_label", "none", TRUE, FALSE},
 	{"title", "picture_tab", "none", TRUE, FALSE},
@@ -33,15 +31,18 @@ static dependency_t dep_map[] =
 	{"vquality_type_bitrate", "VideoAvgBitrate", "TRUE", FALSE, FALSE},
 	{"vquality_type_target", "VideoTargetSize", "TRUE", FALSE, FALSE},
 	{"vquality_type_constant", "VideoQualitySlider", "TRUE", FALSE, FALSE},
-	{"vquality_type_constant", "constant_rate_factor", "TRUE", FALSE, FALSE},
 	{"vquality_type_constant", "VideoTwoPass", "TRUE", TRUE, FALSE},
 	{"vquality_type_constant", "VideoTurboTwoPass", "TRUE", TRUE, FALSE},
 	{"VideoTwoPass", "VideoTurboTwoPass", "TRUE", FALSE, FALSE},
-	{"FileFormat", "Mp4LargeFile", "mp4|m4v", FALSE, TRUE},
-	{"FileFormat", "Mp4HttpOptimize", "mp4|m4v", FALSE, TRUE},
-	{"FileFormat", "Mp4iPodCompatible", "mp4|m4v", FALSE, TRUE},
-	{"PictureDecomb", "PictureDeinterlace", "none", FALSE, FALSE},
-	{"PictureDecomb", "PictureDeinterlaceCustom", "none", FALSE, TRUE},
+	{"FileFormat", "Mp4LargeFile", "mp4", FALSE, TRUE},
+	{"FileFormat", "Mp4HttpOptimize", "mp4", FALSE, TRUE},
+	{"FileFormat", "Mp4iPodCompatible", "mp4", FALSE, TRUE},
+	{"PictureDecombDeinterlace", "PictureDeinterlace", "TRUE", TRUE, TRUE},
+	{"PictureDecombDeinterlace", "PictureDeinterlaceCustom", "TRUE", TRUE, TRUE},
+	{"PictureDecombDeinterlace", "PictureDeinterlaceLabel", "TRUE", TRUE, TRUE},
+	{"PictureDecombDeinterlace", "PictureDecomb", "FALSE", TRUE, TRUE},
+	{"PictureDecombDeinterlace", "PictureDecombCustom", "FALSE", TRUE, TRUE},
+	{"PictureDecombDeinterlace", "PictureDecombLabel", "FALSE", TRUE, TRUE},
 	{"PictureDeinterlace", "PictureDeinterlaceCustom", "custom", FALSE, TRUE},
 	{"PictureDenoise", "PictureDenoiseCustom", "custom", FALSE, TRUE},
 	{"PictureDecomb", "PictureDecombCustom", "custom", FALSE, TRUE},
@@ -68,6 +69,7 @@ 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},