LinGui: remove the dependency between direct-pred and analyse

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

diff --git a/gtk/src/makedeps.c b/gtk/src/makedeps.c
index 433068a7e47f96506dec296d8cde49f32059a3e3..966f2ae78270e62b057b587e08ea2b7a5b41543d 100644 (file)
--- a/gtk/src/makedeps.c
+++ b/gtk/src/makedeps.c
@@ -63,7 +63,6 @@ static dependency_t dep_map[] =
        {"x264_refs", "x264_mixed_refs", "<2", TRUE},
        {"x264_cabac", "x264_trellis", "TRUE", FALSE},
        {"x264_subme", "x264_brdo", "<6", TRUE},
-       {"x264_analyse", "x264_direct", "none", TRUE},
        {"x264_me", "x264_merange", "umh|esa", FALSE},
        {"chapter_markers", "chapters_list", "TRUE", FALSE},
        {"use_source_name", "chapters_in_destination", "TRUE", FALSE},

diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 75866dd032cafd53793a2e7dcd69d2bf08002f0b..ebe3ebd8f509c68285ca5158f207b379ef5ae849 100644 (file)
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -11524,10 +11524,6 @@
 "              <array>\n"
 "                      <string>video_target_size</string>\n"
 "              </array>\n"
-"              <key>x264_analyse</key>\n"
-"              <array>\n"
-"                      <string>x264_direct</string>\n"
-"              </array>\n"
 "              <key>x264_bframes</key>\n"
 "              <array>\n"
 "                      <string>x264_weighted_bframes</string>\n"
@@ -11899,11 +11895,6 @@
 "                              <string>0</string>\n"
 "                              <true />\n"
 "                      </array>\n"
-"                      <array>\n"
-"                              <string>x264_analyse</string>\n"
-"                              <string>none</string>\n"
-"                              <true />\n"
-"                      </array>\n"
 "              </array>\n"
 "              <key>x264_merange</key>\n"
 "              <array>\n"

diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index adbc6527a491fa159d90da2c7086d2d05ecb04f0..ebbe4f0b7d7e53747add23132e50bd538e24c35d 100644 (file)
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -6366,10 +6366,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
                <array>
                        <string>video_target_size</string>
                </array>
-               <key>x264_analyse</key>
-               <array>
-                       <string>x264_direct</string>
-               </array>
                <key>x264_bframes</key>
                <array>
                        <string>x264_weighted_bframes</string>
@@ -6741,11 +6737,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
                                <string>0</string>
                                <true />
                        </array>
-                       <array>
-                               <string>x264_analyse</string>
-                               <string>none</string>
-                               <true />
-                       </array>
                </array>
                <key>x264_merange</key>
                <array>

diff --git a/gtk/src/widget_deps b/gtk/src/widget_deps
index 001202718fc03c0ad7bdf6cde12b13b71f980836..ceb6c79fb943907d20add4fd6d483efaed661e49 100644 (file)
--- a/gtk/src/widget_deps
+++ b/gtk/src/widget_deps
@@ -89,10 +89,6 @@
        <array>
                <string>video_target_size</string>
        </array>
-       <key>x264_analyse</key>
-       <array>
-               <string>x264_direct</string>
-       </array>
        <key>x264_bframes</key>
        <array>
                <string>x264_weighted_bframes</string>

diff --git a/gtk/src/widget_reverse_deps b/gtk/src/widget_reverse_deps
index 25cd55fb7e625370404be7ec6993dcc41eedfc2d..21304aae919d33d4153bd262dfee743da407d5b6 100644 (file)
--- a/gtk/src/widget_reverse_deps
+++ b/gtk/src/widget_reverse_deps
@@ -346,11 +346,6 @@
                        <string>0</string>
                        <true />
                </array>
-               <array>
-                       <string>x264_analyse</string>
-                       <string>none</string>
-                       <true />
-               </array>
        </array>
        <key>x264_merange</key>
        <array>