[cmake/x264] Add auto-variance biased mode (--aq-mode 3) to AQ varian…

…ce menu, increase minimum x264 version from 67 to 144
mean00 · Feb 27, 2020 · df69a8d · df69a8d
1 parent a882a5b
commit df69a8d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui b/avidemux_plugins/ADM_videoEncoder/x264/qt4/x264ConfigDialog.ui
@@ -2836,7 +2836,12 @@
                 </item>
                 <item>
                  <property name="text">
-                  <string>Auto Variance AQ</string>
+                  <string>Auto Variance</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Auto Variance Biased</string>
                  </property>
                 </item>
                </widget>

diff --git a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake
@@ -13,17 +13,12 @@ MACRO(checkX264)
                                 STRING(REGEX MATCH "#define[ ]+X264_BUILD[ ]+([0-9]+)" X264_H "${X264_H}")
                                 STRING(REGEX REPLACE ".*[ ]([0-9]+).*" "\\1" x264_version "${X264_H}")
                                 MESSAGE(STATUS "  core version: ${x264_version}")
-
-                                IF (x264_version LESS 67)
-                                        MESSAGE("WARNING: x264 core version is too old.  At least version 67 is required.")
+                                IF (x264_version LESS 144)
+                                        MESSAGE("WARNING: x264 core version is too old.  At least version 144 is required.")
                                         SET(X264_FOUND 0)
-                                ELSE (x264_version LESS 67)
-                                        IF (x264_version GREATER 73)
-                                                FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
-                                        ELSE (x264_version GREATER 73)
-                                                FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
-                                        ENDIF (x264_version GREATER 73)
-                                ENDIF (x264_version LESS 67)
+                                ELSE (x264_version LESS 144)
+                                        FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
+                                ENDIF (x264_version LESS 144)
                                 IF (X264_FOUND)
                                         SET(USE_X264 True CACHE BOOL "")
                                 ENDIF(X264_FOUND)