From 8e2b012ed8ccb5e09fe85b49f41458e8efe5c065 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 2 Nov 2014 20:31:29 +0100 Subject: [PATCH] Added support for Windows 10 tech preview. --- etc/manifest/compat.manifest | 2 ++ src/global.cpp | 5 +++++ src/version.h | 2 +- src/win_main.cpp | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/etc/manifest/compat.manifest b/etc/manifest/compat.manifest index f95c027..fce5b0f 100644 --- a/etc/manifest/compat.manifest +++ b/etc/manifest/compat.manifest @@ -10,6 +10,8 @@ + + diff --git a/src/global.cpp b/src/global.cpp index 1e199d5..b8b9e1f 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -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_win80 = {6,2}; const x264_os_version_t x264_winver_win81 = {6,3}; +const x264_os_version_t x264_winver_wn100 = {6,4}; //GURU MEDITATION 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); } + else if(osVersionNo == x264_winver_wn100) + { + qDebug("Running on Windows 10 or Windows Server 2014.\n"); //x264_check_compatibility_mode(NULL, executableName); + } else { const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (v%u.%u).", osVersionNo.versionMajor, osVersionNo.versionMinor); diff --git a/src/version.h b/src/version.h index 6a2786f..45c60fb 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 4 #define VER_X264_PATCH 4 -#define VER_X264_BUILD 890 +#define VER_X264_BUILD 891 #define VER_X264_PORTABLE_EDITION (0) diff --git a/src/win_main.cpp b/src/win_main.cpp index e4292fd..3fc1c32 100644 --- a/src/win_main.cpp +++ b/src/win_main.cpp @@ -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->actionWebJEEB, "http://x264.fushizen.eu/"); 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->actionWebX265BinORG, "http://chromashift.org/x265_builds/"); SETUP_WEBLINK(ui->actionWebX265BinFF, "http://ffmpeg.zeranoe.com/builds/");