From bdd55a654a633078bdd4cc4ac80d519adc0a6e99 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 22 Jul 2019 19:25:29 +0200 Subject: [PATCH] Fixed regression: Do not show a "critical" error message, if VapourSynth could not be found. --- src/thread_vapoursynth.cpp | 9 +++++---- src/version.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/thread_vapoursynth.cpp b/src/thread_vapoursynth.cpp index 3298cdf..6e7b5ac 100644 --- a/src/thread_vapoursynth.cpp +++ b/src/thread_vapoursynth.cpp @@ -122,19 +122,20 @@ bool VapourSynthCheckThread::detect(SysinfoModel* sysinfo) return false; } - if (!thread.getSuccess()) + const int success = thread.getSuccess(); + if (!success) { qWarning("VapourSynth could not be found -> VapourSynth support disabled!"); - return false; + return true; } - if (thread.getSuccess() & VAPOURSYNTH_X86) + if (success & VAPOURSYNTH_X86) { sysinfo->setVapourSynth(SysinfoModel::VapourSynth_X86, true); sysinfo->setVPS32Path(thread.getPath32()); } - if (thread.getSuccess() & VAPOURSYNTH_X64) + if (success & VAPOURSYNTH_X64) { sysinfo->setVapourSynth(SysinfoModel::VapourSynth_X64, true); sysinfo->setVPS64Path(thread.getPath64()); diff --git a/src/version.h b/src/version.h index 6cfa6cd..6d4a38f 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 9 #define VER_X264_PATCH 2 -#define VER_X264_BUILD 1174 +#define VER_X264_BUILD 1176 #define VER_X264_PORTABLE_EDITION (0)