From cfe88da4fce541561923c8368b03317e78a7ce23 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Thu, 23 May 2013 22:15:33 +0200 Subject: [PATCH] Make help screen work again + updated Readme file. --- ReadMe.txt | 19 +++++++------------ src/thread_encode.cpp | 2 +- src/version.h | 6 +++--- src/win_help.cpp | 5 +++-- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index 1f1506f..1fd4477 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -198,19 +198,14 @@ For convenience, the string "--audiofile $(INPUT)" may be used. 11. OpenCL Support ----------------------- -Newer builds of x264 now support OpenCL Lookahead, which can be enabled -with the "--opencl" parameter. However, even if you do NOT want to use -this feature, x264 will still depend on the OpenCL library (OpenCL.DLL) -and it will NOT even start, if the OpenCL DLL is missing! For this -reason, the Simple x264 Launcher ships with a "dummy" OpenCL library to -make x264 start on systems that do NOT support OpenCL. As a side effect -of this workaround, any OpenCL functions in x264 will not work at all! +Newer builds of x264 now support OpenCL Lookahead, i.e. GPU accelerated +encoding. This can be enabled with the "--opencl" custom parameter. But +OpenCL Lookahead will only work if you have an OpenCL-capable graphics +card *and* if you have an up-to-date video driver installed! -If your video hardware supports OpenCL *and* if you have an up-to-date -video driver with OpenCL support installed *and* if you which to use -the OpenCL Lookahead function, then please remove the dummy OpenCL.DLL -from the Simple x264 Launcher directory, so x264 can load the system's -OpenCL.DLL (from system directory), provided by the video driver. +Note that x264 will now *only* try to load the OpenCL.DLL if you really +use the "--opencl" option. Therefore, the "dummy" OpenCL.DLL included +in older versions of the Simple x264 Launcher is *NOT* needed anymore!! 12. Command-line Syntax diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp index 8d1e818..47ad5f9 100644 --- a/src/thread_encode.cpp +++ b/src/thread_encode.cpp @@ -92,7 +92,7 @@ while(0) while(0) #define AVS2_BINARY(BIN_DIR, IS_X64) QString("%1/%2/avs2yuv_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86")) -#define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) QString("%1/%2/x264_%3_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"), ((IS_10BIT) ? "10bit" : "8bit")) +#define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) QString("%1/%2/x264_%3_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"), ((IS_10BIT) ? "10bit" : "8bit")) /* * Static vars diff --git a/src/version.h b/src/version.h index 4d1bb26..75bf17f 100644 --- a/src/version.h +++ b/src/version.h @@ -21,11 +21,11 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 1 -#define VER_X264_PATCH 1 -#define VER_X264_BUILD 465 +#define VER_X264_PATCH 3 +#define VER_X264_BUILD 470 #define VER_X264_MINIMUM_REV 2282 -#define VER_X264_CURRENT_API 132 +#define VER_X264_CURRENT_API 133 #define VER_X264_AVS2YUV_VER 242 #define VER_X264_PRE_RELEASE (0) diff --git a/src/win_help.cpp b/src/win_help.cpp index a3cce3b..af64f58 100644 --- a/src/win_help.cpp +++ b/src/win_help.cpp @@ -26,7 +26,8 @@ #include #include -#define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) QString("%1/x264_%2_%3.exe").arg((BIN_DIR), ((IS_10BIT) ? "10bit" : "8bit"), ((IS_X64) ? "x64" : "x86")) +#define AVS2_BINARY(BIN_DIR, IS_X64) QString("%1/%2/avs2yuv_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86")) +#define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) QString("%1/%2/x264_%3_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"), ((IS_10BIT) ? "10bit" : "8bit")) /////////////////////////////////////////////////////////////////////////////// // Constructor & Destructor @@ -81,7 +82,7 @@ void HelpDialog::showEvent(QShowEvent *event) } else { - m_process->start(QString("%1/%2.exe").arg(m_appDir, m_x64supported ? "avs2yuv_x64" : "avs2yuv_x86"), QStringList()); + m_process->start(AVS2_BINARY(m_appDir, m_x64supported), QStringList()); } if(!m_process->waitForStarted())