Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Make help screen work again + updated Readme file.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-05-23 22:15:33 +02:00
parent a3072d9c6b
commit cfe88da4fc
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ReadMe.txt
View File

@ -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

2
src/thread_encode.cpp
View File

@ -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

6
src/version.h
View File

@ -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)

5
src/win_help.cpp
View File

@ -26,7 +26,8 @@
#include <QScrollBar>
#include <QTimer>
#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())