Fixed regression: Do not show a "critical" error message, if VapourSynth could not be found.
This commit is contained in:
parent
cb42e52fb1
commit
bdd55a654a
@ -122,19 +122,20 @@ bool VapourSynthCheckThread::detect(SysinfoModel* sysinfo)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!thread.getSuccess())
|
const int success = thread.getSuccess();
|
||||||
|
if (!success)
|
||||||
{
|
{
|
||||||
qWarning("VapourSynth could not be found -> VapourSynth support disabled!");
|
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->setVapourSynth(SysinfoModel::VapourSynth_X86, true);
|
||||||
sysinfo->setVPS32Path(thread.getPath32());
|
sysinfo->setVPS32Path(thread.getPath32());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (thread.getSuccess() & VAPOURSYNTH_X64)
|
if (success & VAPOURSYNTH_X64)
|
||||||
{
|
{
|
||||||
sysinfo->setVapourSynth(SysinfoModel::VapourSynth_X64, true);
|
sysinfo->setVapourSynth(SysinfoModel::VapourSynth_X64, true);
|
||||||
sysinfo->setVPS64Path(thread.getPath64());
|
sysinfo->setVPS64Path(thread.getPath64());
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#define VER_X264_MAJOR 2
|
#define VER_X264_MAJOR 2
|
||||||
#define VER_X264_MINOR 9
|
#define VER_X264_MINOR 9
|
||||||
#define VER_X264_PATCH 2
|
#define VER_X264_PATCH 2
|
||||||
#define VER_X264_BUILD 1174
|
#define VER_X264_BUILD 1176
|
||||||
|
|
||||||
#define VER_X264_PORTABLE_EDITION (0)
|
#define VER_X264_PORTABLE_EDITION (0)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user