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

Added support for Windows 10 tech preview.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-11-02 20:31:29 +01:00
parent c1fd967277
commit 8e2b012ed8
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/manifest/compat.manifest
View File

@ -10,6 +10,8 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 --> <!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application> </application>
</compatibility> </compatibility>
</assembly> </assembly>

5
src/global.cpp
View File

@ -184,6 +184,7 @@ const x264_os_version_t x264_winver_vista = {6,0};
const x264_os_version_t x264_winver_win70 = {6,1}; const x264_os_version_t x264_winver_win70 = {6,1};
const x264_os_version_t x264_winver_win80 = {6,2}; const x264_os_version_t x264_winver_win80 = {6,2};
const x264_os_version_t x264_winver_win81 = {6,3}; const x264_os_version_t x264_winver_win81 = {6,3};
const x264_os_version_t x264_winver_wn100 = {6,4};
//GURU MEDITATION //GURU MEDITATION
static const char *GURU_MEDITATION = "\n\nGURU MEDITATION !!!\n\n"; static const char *GURU_MEDITATION = "\n\nGURU MEDITATION !!!\n\n";
@ -1464,6 +1465,10 @@ bool x264_init_qt(int &argc, char **argv)
{ {
qDebug("Running on Windows 8.1 or Windows Server 2012 R2.\n"); //x264_check_compatibility_mode(NULL, executableName); qDebug("Running on Windows 8.1 or Windows Server 2012 R2.\n"); //x264_check_compatibility_mode(NULL, executableName);
} }
else if(osVersionNo == x264_winver_wn100)
{
qDebug("Running on Windows 10 or Windows Server 2014.\n"); //x264_check_compatibility_mode(NULL, executableName);
}
else else
{ {
const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (v%u.%u).", osVersionNo.versionMajor, osVersionNo.versionMinor); const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (v%u.%u).", osVersionNo.versionMajor, osVersionNo.versionMinor);

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 4 #define VER_X264_MINOR 4
#define VER_X264_PATCH 4 #define VER_X264_PATCH 4
#define VER_X264_BUILD 890 #define VER_X264_BUILD 891
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)

2
src/win_main.cpp
View File

@ -204,7 +204,7 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures, IPC *ipc)
SETUP_WEBLINK(ui->actionWebVideoLAN, "http://download.videolan.org/pub/x264/binaries/"); SETUP_WEBLINK(ui->actionWebVideoLAN, "http://download.videolan.org/pub/x264/binaries/");
SETUP_WEBLINK(ui->actionWebJEEB, "http://x264.fushizen.eu/"); SETUP_WEBLINK(ui->actionWebJEEB, "http://x264.fushizen.eu/");
SETUP_WEBLINK(ui->actionWebFreeCodecs, "http://www.free-codecs.com/x264_video_codec_download.htm"); SETUP_WEBLINK(ui->actionWebFreeCodecs, "http://www.free-codecs.com/x264_video_codec_download.htm");
SETUP_WEBLINK(ui->actionWebX265BinRU, "http://goo.gl/xRS6AW"); SETUP_WEBLINK(ui->actionWebX265BinRU, "http://x265.ru/en/builds/");
SETUP_WEBLINK(ui->actionWebX265BinEU, "http://builds.x265.eu/"); SETUP_WEBLINK(ui->actionWebX265BinEU, "http://builds.x265.eu/");
SETUP_WEBLINK(ui->actionWebX265BinORG, "http://chromashift.org/x265_builds/"); SETUP_WEBLINK(ui->actionWebX265BinORG, "http://chromashift.org/x265_builds/");
SETUP_WEBLINK(ui->actionWebX265BinFF, "http://ffmpeg.zeranoe.com/builds/"); SETUP_WEBLINK(ui->actionWebX265BinFF, "http://ffmpeg.zeranoe.com/builds/");