From d90f8d0508f1093ea1887e564da9b9c39e0548b8 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 26 Feb 2018 15:56:51 +0100 Subject: [PATCH] Updated copyright year. --- Copying.txt | 2 +- HISTORY.txt | 5 +++++ README.md | 10 +++++----- etc/setup/language/en.nsh | 2 +- etc/setup/setup.nsi | 2 +- src/cli.h | 2 +- src/encoder_abstract.cpp | 2 +- src/encoder_abstract.h | 2 +- src/encoder_factory.cpp | 2 +- src/encoder_factory.h | 2 +- src/encoder_nvencc.cpp | 2 +- src/encoder_nvencc.h | 2 +- src/encoder_x264.h | 2 +- src/encoder_x265.h | 2 +- src/global.cpp | 2 +- src/global.h | 2 +- src/input_filter.cpp | 2 +- src/input_filter.h | 2 +- src/ipc.h | 2 +- src/job_object.cpp | 2 +- src/job_object.h | 2 +- src/main.cpp | 2 +- src/mediainfo.cpp | 2 +- src/mediainfo.h | 2 +- src/model_clipInfo.cpp | 2 +- src/model_clipInfo.h | 2 +- src/model_jobList.cpp | 2 +- src/model_jobList.h | 2 +- src/model_logFile.cpp | 2 +- src/model_logFile.h | 2 +- src/model_options.cpp | 2 +- src/model_options.h | 2 +- src/model_preferences.cpp | 2 +- src/model_preferences.h | 2 +- src/model_recently.cpp | 2 +- src/model_recently.h | 2 +- src/model_status.h | 2 +- src/model_sysinfo.h | 2 +- src/source_abstract.cpp | 2 +- src/source_abstract.h | 2 +- src/source_avisynth.cpp | 2 +- src/source_avisynth.h | 2 +- src/source_factory.cpp | 2 +- src/source_factory.h | 2 +- src/source_vapoursynth.cpp | 2 +- src/source_vapoursynth.h | 2 +- src/string_validator.cpp | 6 +++--- src/string_validator.h | 2 +- src/thread_avisynth.cpp | 2 +- src/thread_avisynth.h | 2 +- src/thread_binaries.cpp | 2 +- src/thread_binaries.h | 2 +- src/thread_encode.cpp | 2 +- src/thread_encode.h | 2 +- src/thread_ipc_recv.cpp | 2 +- src/thread_ipc_recv.h | 2 +- src/thread_ipc_send.cpp | 2 +- src/thread_ipc_send.h | 2 +- src/thread_vapoursynth.cpp | 2 +- src/thread_vapoursynth.h | 2 +- src/tool_abstract.cpp | 2 +- src/tool_abstract.h | 2 +- src/version.h | 6 +++--- src/win_about.cpp | 2 +- src/win_about.h | 2 +- src/win_addJob.cpp | 2 +- src/win_addJob.h | 2 +- src/win_editor.cpp | 2 +- src/win_editor.h | 2 +- src/win_help.cpp | 2 +- src/win_help.h | 2 +- src/win_main.cpp | 2 +- src/win_main.h | 2 +- src/win_preferences.cpp | 2 +- src/win_preferences.h | 2 +- src/win_updater.cpp | 2 +- src/win_updater.h | 2 +- src/zero.cpp | 2 +- x264_launcher_MSVC2017.sln | 7 +++++-- z_build.bat | 4 ++-- 80 files changed, 97 insertions(+), 89 deletions(-) diff --git a/Copying.txt b/Copying.txt index 627451a..9b8d936 100644 --- a/Copying.txt +++ b/Copying.txt @@ -1,5 +1,5 @@ Simple x264/x265 Launcher - graphical video encoder front-end -Copyright (C) 2004-2017 LoRd_MuldeR +Copyright (C) 2004-2018 LoRd_MuldeR This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/HISTORY.txt b/HISTORY.txt index c87e6e1..de365d9 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -2,6 +2,11 @@ Simple x264/x265 Launcher version history ----------------------------------------- +Version 2.86 [2018-02-26] +* Updated x264 to revision 2901 (API v155) +* Updated x265 to version 2.7+1 +* x264 now uses combined 8-Bit/10-Bit binaries + Version 2.85 [2017-10-04] * Updated x265 to version 2.5+22 * Updated build environment to Visual Studio 2017 with Update-3 diff --git a/README.md b/README.md index 0054842..8a05822 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Occasionally your Antivirus program may mistakenly detect "malware" (virus, troj # License # -Simple x264/x265 Launcher is Copyright (C) 2004-2017 LoRd_MuldeR. +Simple x264/x265 Launcher is Copyright (C) 2004-2018 LoRd_MuldeR. ``` This program is free software; you can redistribute it and/or modify @@ -78,15 +78,15 @@ The following third-party software is used by this application: http://qt.digia.com/ Qt is a free software, released under the terms of GNU GPL, version 3. -* The x264 encoder software is Copyright (C) 2003-2017 x264 project. +* The x264 encoder software is Copyright (C) 2003-2018 x264 project. http://www.videolan.org/developers/x264.html x264 is a free software and is released under the terms of the GNU GPL. -* The x265 encoder software is Copyright (C) 2013-2017 x265 project. +* The x265 encoder software is Copyright (C) 2013-2018 x265 project. http://www.videolan.org/developers/x265.html x265 is a free software and is released under the terms of the GNU GPL. -* The NVEncC encoder software is Copyright (c) 1999-2017 rigaya. +* The NVEncC encoder software is Copyright (c) 1999-2018 rigaya. https://onedrive.live.com/?id=6BDD4375AC8933C6%212293&cid=6BDD4375AC8933C6 NVEncC is a free software and is released under the terms of the MIT License. @@ -94,7 +94,7 @@ The following third-party software is used by this application: http://avisynth.nl/index.php/Main_Page AviSynth is a free software, released under the terms of the GNU GPL. -* VapourSynth is Copyright (c) 2012-2017 Fredrik Mellbin. +* VapourSynth is Copyright (c) 2012-2018 Fredrik Mellbin. http://www.vapoursynth.com/ VapourSynth is free software, released under the terms of the GNU LGPL. diff --git a/etc/setup/language/en.nsh b/etc/setup/language/en.nsh index 5dd3957..b2c2615 100644 --- a/etc/setup/language/en.nsh +++ b/etc/setup/language/en.nsh @@ -1,6 +1,6 @@ ; /////////////////////////////////////////////////////////////////////////////// ; // Simple x264 Launcher -; // Copyright (C) 2004-2017 LoRd_MuldeR +; // Copyright (C) 2004-2018 LoRd_MuldeR ; // ; // This program is free software; you can redistribute it and/or modify ; // it under the terms of the GNU General Public License as published by diff --git a/etc/setup/setup.nsi b/etc/setup/setup.nsi index a7a3d85..bde9282 100644 --- a/etc/setup/setup.nsi +++ b/etc/setup/setup.nsi @@ -1,6 +1,6 @@ ; /////////////////////////////////////////////////////////////////////////////// ; // Simple x264 Launcher -; // Copyright (C) 2004-2017 LoRd_MuldeR +; // Copyright (C) 2004-2018 LoRd_MuldeR ; // ; // This program is free software; you can redistribute it and/or modify ; // it under the terms of the GNU General Public License as published by diff --git a/src/cli.h b/src/cli.h index 24ea4d5..c87bd2f 100644 --- a/src/cli.h +++ b/src/cli.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_abstract.cpp b/src/encoder_abstract.cpp index 4a76e4e..31c1f7d 100644 --- a/src/encoder_abstract.cpp +++ b/src/encoder_abstract.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_abstract.h b/src/encoder_abstract.h index b9a4a96..c3c1f2e 100644 --- a/src/encoder_abstract.h +++ b/src/encoder_abstract.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_factory.cpp b/src/encoder_factory.cpp index 2835f37..bee8b99 100644 --- a/src/encoder_factory.cpp +++ b/src/encoder_factory.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_factory.h b/src/encoder_factory.h index b652ae4..a2df250 100644 --- a/src/encoder_factory.h +++ b/src/encoder_factory.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_nvencc.cpp b/src/encoder_nvencc.cpp index c5b95eb..d5c1a29 100644 --- a/src/encoder_nvencc.cpp +++ b/src/encoder_nvencc.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_nvencc.h b/src/encoder_nvencc.h index d7148d9..881b168 100644 --- a/src/encoder_nvencc.h +++ b/src/encoder_nvencc.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_x264.h b/src/encoder_x264.h index 7e9ec95..42acb9e 100644 --- a/src/encoder_x264.h +++ b/src/encoder_x264.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/encoder_x265.h b/src/encoder_x265.h index 46cffc8..6f44f5a 100644 --- a/src/encoder_x265.h +++ b/src/encoder_x265.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/global.cpp b/src/global.cpp index e4f1ee0..72c8c00 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/global.h b/src/global.h index b3c813c..3964de5 100644 --- a/src/global.h +++ b/src/global.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/input_filter.cpp b/src/input_filter.cpp index 5322103..6384476 100644 --- a/src/input_filter.cpp +++ b/src/input_filter.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/input_filter.h b/src/input_filter.h index 6816fe3..783aa99 100644 --- a/src/input_filter.h +++ b/src/input_filter.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/ipc.h b/src/ipc.h index d09a985..0d1bcba 100644 --- a/src/ipc.h +++ b/src/ipc.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/job_object.cpp b/src/job_object.cpp index 910c96e..aceb7d2 100644 --- a/src/job_object.cpp +++ b/src/job_object.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/job_object.h b/src/job_object.h index 86fdbd7..7b7706e 100644 --- a/src/job_object.h +++ b/src/job_object.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/main.cpp b/src/main.cpp index 70026de..2d3c3f0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/mediainfo.cpp b/src/mediainfo.cpp index 437016f..e0d28e0 100644 --- a/src/mediainfo.cpp +++ b/src/mediainfo.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/mediainfo.h b/src/mediainfo.h index 54b56a1..482b330 100644 --- a/src/mediainfo.h +++ b/src/mediainfo.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_clipInfo.cpp b/src/model_clipInfo.cpp index 0eaf812..c1d6f7c 100644 --- a/src/model_clipInfo.cpp +++ b/src/model_clipInfo.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_clipInfo.h b/src/model_clipInfo.h index 309163a..e50c462 100644 --- a/src/model_clipInfo.h +++ b/src/model_clipInfo.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_jobList.cpp b/src/model_jobList.cpp index 1ade13f..5acc1d9 100644 --- a/src/model_jobList.cpp +++ b/src/model_jobList.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_jobList.h b/src/model_jobList.h index 991837d..bdc0b0e 100644 --- a/src/model_jobList.h +++ b/src/model_jobList.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_logFile.cpp b/src/model_logFile.cpp index bd8de1d..74c4cf5 100644 --- a/src/model_logFile.cpp +++ b/src/model_logFile.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_logFile.h b/src/model_logFile.h index 83371d6..3e06507 100644 --- a/src/model_logFile.h +++ b/src/model_logFile.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_options.cpp b/src/model_options.cpp index 10383ba..aa2cabf 100644 --- a/src/model_options.cpp +++ b/src/model_options.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_options.h b/src/model_options.h index 03bf4ed..91c7564 100644 --- a/src/model_options.h +++ b/src/model_options.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_preferences.cpp b/src/model_preferences.cpp index 5a9b433..4a364af 100644 --- a/src/model_preferences.cpp +++ b/src/model_preferences.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_preferences.h b/src/model_preferences.h index a869e98..ae522e8 100644 --- a/src/model_preferences.h +++ b/src/model_preferences.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_recently.cpp b/src/model_recently.cpp index c95ee86..82c217a 100644 --- a/src/model_recently.cpp +++ b/src/model_recently.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_recently.h b/src/model_recently.h index 3273d97..c11a4a2 100644 --- a/src/model_recently.h +++ b/src/model_recently.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_status.h b/src/model_status.h index a09e2cb..1b63bef 100644 --- a/src/model_status.h +++ b/src/model_status.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/model_sysinfo.h b/src/model_sysinfo.h index 672d1db..430534b 100644 --- a/src/model_sysinfo.h +++ b/src/model_sysinfo.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_abstract.cpp b/src/source_abstract.cpp index 955c47a..5803169 100644 --- a/src/source_abstract.cpp +++ b/src/source_abstract.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_abstract.h b/src/source_abstract.h index bd35e5e..f6dd76f 100644 --- a/src/source_abstract.h +++ b/src/source_abstract.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_avisynth.cpp b/src/source_avisynth.cpp index d86417a..9f1e178 100644 --- a/src/source_avisynth.cpp +++ b/src/source_avisynth.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_avisynth.h b/src/source_avisynth.h index d947b62..09bda56 100644 --- a/src/source_avisynth.h +++ b/src/source_avisynth.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_factory.cpp b/src/source_factory.cpp index 336d4a7..1369fd9 100644 --- a/src/source_factory.cpp +++ b/src/source_factory.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_factory.h b/src/source_factory.h index 955f932..1ea30fe 100644 --- a/src/source_factory.h +++ b/src/source_factory.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_vapoursynth.cpp b/src/source_vapoursynth.cpp index 41ed019..78d2652 100644 --- a/src/source_vapoursynth.cpp +++ b/src/source_vapoursynth.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/source_vapoursynth.h b/src/source_vapoursynth.h index b3fa640..7580e6f 100644 --- a/src/source_vapoursynth.h +++ b/src/source_vapoursynth.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/string_validator.cpp b/src/string_validator.cpp index 3861a89..19dddf7 100644 --- a/src/string_validator.cpp +++ b/src/string_validator.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -167,8 +167,8 @@ const bool &StringValidator::setStatus(const bool &flag, const QString &toolName QValidator::State StringValidatorEncoder::validate(QString &input, int &pos) const { - static const char *const params[] = {"D", "B", "o", "h", "p", "q", /*"fps", "frames",*/ "preset", "tune", "profile", - "stdin", "crf", "bitrate", "qp", "pass", "stats", "output", "help", "quiet", "codec", "y4m", NULL}; + static const char *const params[] = { "D", "B", "o", "h", "p", "q", /*"fps", "frames",*/ "preset", "tune", "profile", + "stdin", "crf", "bitrate", "qp", "pass", "stats", "output", "output-depth", "help", "quiet", "codec", "y4m", NULL }; const QString commandLine = input.trimmed(); const QStringList tokens = commandLine.isEmpty() ? QStringList() : MUtils::OS::crack_command_line(commandLine); diff --git a/src/string_validator.h b/src/string_validator.h index 59b8e78..6c2dcec 100644 --- a/src/string_validator.h +++ b/src/string_validator.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_avisynth.cpp b/src/thread_avisynth.cpp index b0c797d..491b30c 100644 --- a/src/thread_avisynth.cpp +++ b/src/thread_avisynth.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_avisynth.h b/src/thread_avisynth.h index 5e4045f..3fe4853 100644 --- a/src/thread_avisynth.h +++ b/src/thread_avisynth.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_binaries.cpp b/src/thread_binaries.cpp index 608a505..3bd6a19 100644 --- a/src/thread_binaries.cpp +++ b/src/thread_binaries.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_binaries.h b/src/thread_binaries.h index 01b8d91..87ea7f6 100644 --- a/src/thread_binaries.h +++ b/src/thread_binaries.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp index 0706db9..e3f539e 100644 --- a/src/thread_encode.cpp +++ b/src/thread_encode.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_encode.h b/src/thread_encode.h index e504e8c..1d9d9e8 100644 --- a/src/thread_encode.h +++ b/src/thread_encode.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_ipc_recv.cpp b/src/thread_ipc_recv.cpp index 88bc24c..f998b03 100644 --- a/src/thread_ipc_recv.cpp +++ b/src/thread_ipc_recv.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_ipc_recv.h b/src/thread_ipc_recv.h index 6865ca4..8d24433 100644 --- a/src/thread_ipc_recv.h +++ b/src/thread_ipc_recv.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_ipc_send.cpp b/src/thread_ipc_send.cpp index 3062cdf..0dacc57 100644 --- a/src/thread_ipc_send.cpp +++ b/src/thread_ipc_send.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_ipc_send.h b/src/thread_ipc_send.h index 0893fff..a743cf8 100644 --- a/src/thread_ipc_send.h +++ b/src/thread_ipc_send.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_vapoursynth.cpp b/src/thread_vapoursynth.cpp index 276c13d..027b75c 100644 --- a/src/thread_vapoursynth.cpp +++ b/src/thread_vapoursynth.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/thread_vapoursynth.h b/src/thread_vapoursynth.h index 5761cd9..593b61a 100644 --- a/src/thread_vapoursynth.h +++ b/src/thread_vapoursynth.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/tool_abstract.cpp b/src/tool_abstract.cpp index 62ed5c2..d8f161c 100644 --- a/src/tool_abstract.cpp +++ b/src/tool_abstract.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/tool_abstract.h b/src/tool_abstract.h index 0ed5941..18416cf 100644 --- a/src/tool_abstract.h +++ b/src/tool_abstract.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/version.h b/src/version.h index eaffce1..0001642 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,8 +25,8 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 8 -#define VER_X264_PATCH 5 -#define VER_X264_BUILD 1118 +#define VER_X264_PATCH 6 +#define VER_X264_BUILD 1120 #define VER_X264_PORTABLE_EDITION (0) diff --git a/src/win_about.cpp b/src/win_about.cpp index 3a4f124..c8538a7 100644 --- a/src/win_about.cpp +++ b/src/win_about.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_about.h b/src/win_about.h index 06d7f88..716d79d 100644 --- a/src/win_about.h +++ b/src/win_about.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_addJob.cpp b/src/win_addJob.cpp index a574f5b..866b083 100644 --- a/src/win_addJob.cpp +++ b/src/win_addJob.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_addJob.h b/src/win_addJob.h index e9262cd..02152e0 100644 --- a/src/win_addJob.h +++ b/src/win_addJob.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_editor.cpp b/src/win_editor.cpp index b612d35..8bd1085 100644 --- a/src/win_editor.cpp +++ b/src/win_editor.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_editor.h b/src/win_editor.h index 2611783..0b9ef19 100644 --- a/src/win_editor.h +++ b/src/win_editor.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_help.cpp b/src/win_help.cpp index 64bc9b3..d5bb49a 100644 --- a/src/win_help.cpp +++ b/src/win_help.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_help.h b/src/win_help.h index 56e417c..9aeb0a9 100644 --- a/src/win_help.h +++ b/src/win_help.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_main.cpp b/src/win_main.cpp index 3458502..36451ef 100644 --- a/src/win_main.cpp +++ b/src/win_main.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_main.h b/src/win_main.h index 4f60a44..4827d0a 100644 --- a/src/win_main.h +++ b/src/win_main.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_preferences.cpp b/src/win_preferences.cpp index 19303f2..b4fb50a 100644 --- a/src/win_preferences.cpp +++ b/src/win_preferences.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_preferences.h b/src/win_preferences.h index 94cc5e1..6a93327 100644 --- a/src/win_preferences.h +++ b/src/win_preferences.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_updater.cpp b/src/win_updater.cpp index 0826796..4f83cf1 100644 --- a/src/win_updater.cpp +++ b/src/win_updater.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/win_updater.h b/src/win_updater.h index 0508313..c064bd8 100644 --- a/src/win_updater.h +++ b/src/win_updater.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/zero.cpp b/src/zero.cpp index 6561c47..bdbdb99 100644 --- a/src/zero.cpp +++ b/src/zero.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Simple x264 Launcher -// Copyright (C) 2004-2017 LoRd_MuldeR +// Copyright (C) 2004-2018 LoRd_MuldeR // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/x264_launcher_MSVC2017.sln b/x264_launcher_MSVC2017.sln index d7d87ad..1e0b224 100644 --- a/x264_launcher_MSVC2017.sln +++ b/x264_launcher_MSVC2017.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x264_launcher", "x264_launcher_MSVC2017.vcxproj", "{563D953B-CBC3-4C75-AFC2-5BD87531C332}" ProjectSection(ProjectDependencies) = postProject @@ -32,4 +32,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8D6A637C-785A-4DBF-9FBA-0781491C99BA} + EndGlobalSection EndGlobal diff --git a/z_build.bat b/z_build.bat index 2695276..b996bcf 100644 --- a/z_build.bat +++ b/z_build.bat @@ -168,7 +168,7 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Create Tag REM /////////////////////////////////////////////////////////////////////////// echo Simple x264/x265 Launcher - graphical front-end for x264 and x265 > "%PACK_PATH%\BUILD_TAG.txt" -echo Copyright (C) 2004-2017 LoRd_MuldeR ^ >> "%PACK_PATH%\BUILD_TAG.txt" +echo Copyright (C) 2004-2018 LoRd_MuldeR ^ >> "%PACK_PATH%\BUILD_TAG.txt" echo. >> "%PACK_PATH%\BUILD_TAG.txt" echo Build #%BUILD_NO%, created on %ISO_DATE% at %ISO_TIME% >> "%PACK_PATH%\BUILD_TAG.txt" echo. >> "%PACK_PATH%\BUILD_TAG.txt" @@ -186,7 +186,7 @@ if not "%ERRORLEVEL%"=="0" goto BuildError set "VERPATCH_PRODUCT=Simple x264/x265 Launcher (Setup)" set "VERPATCH_FILEVER=%ISO_DATE:-=.%.%BUILD_NO%" -"%~dp0\..\Prerequisites\VerPatch\verpatch.exe" "%OUT_PATH%.exe" "%VERPATCH_FILEVER%" /pv "%VERPATCH_FILEVER%" /fn /s desc "%VERPATCH_PRODUCT%" /s product "%VERPATCH_PRODUCT%" /s title "x264 Launcher Installer SFX" /s copyright "Copyright (C) 2004-2017 LoRd_MuldeR" /s company "Free Software Foundation" +"%~dp0\..\Prerequisites\VerPatch\verpatch.exe" "%OUT_PATH%.exe" "%VERPATCH_FILEVER%" /pv "%VERPATCH_FILEVER%" /fn /s desc "%VERPATCH_PRODUCT%" /s product "%VERPATCH_PRODUCT%" /s title "x264 Launcher Installer SFX" /s copyright "Copyright (C) 2004-2018 LoRd_MuldeR" /s company "Free Software Foundation" if not "%ERRORLEVEL%"=="0" goto BuildError attrib +R "%OUT_PATH%.exe"