From 8a8bb94399495e44762e34bc7731562559ac3314 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 17 Oct 2015 14:26:10 +0200 Subject: [PATCH] Updated CHANGELOG and README file. --- HISTORY.txt | 5 +++++ README.md | 5 +++-- src/version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/HISTORY.txt b/HISTORY.txt index d16f508..ad6ff2b 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -2,6 +2,11 @@ Simple x264/x265 Launcher version history ----------------------------------------- +Version 2.61 [unreleased] +* Refined custom parameters validation code, again +* Fixed processing of CLI arguments for Launcher (regression in v2.60) +* Updated x264 to revision 2638 + Version 2.60 [2015-10-12] * Much improved validation of custom parameters * Massive code clean-up diff --git a/README.md b/README.md index 1017fc1..c836f3f 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ Note that x264 will now *only* try to load the OpenCL.DLL if you really use the # Command-line Syntax # -**PLEASE NOTE:** These are parameters you can pass to Simple x264 Launcher, they can ***not*** be passed to x264 or x265 as "custom" parameters !!! +**PLEASE NOTE:** These are parameters you can pass to Simple x264 Launcher (`x264_launcher.exe`), they can **NOT** be passed to x264 or x265 as "custom" parameters !!! The following command-line switches are available: ``` @@ -152,8 +152,9 @@ The following command-line switches are available: --[no-]force-enqueue ............. Append the next job to the queue --skip-avisynth-check ............ Skip Avisynth detection --skip-vapoursynth-check ......... Skip VapourSynth detection +--skip-version-checks ......... Skip x264/x265 version checks, NOT recommended! --force-cpu-no-64bit ............. Forcefully disable 64-Bit support ---no-deadlock-detection .......... Don't abort a processes on deadlock +--no-deadlock-detection .......... Do not abort a sub-process on possible deadlock --[no-]console ................... Do [not] show the Debug console --no-style ....................... Don't use the Qt "Plastique" style ``` diff --git a/src/version.h b/src/version.h index 15b19fe..5f246db 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 6 #define VER_X264_PATCH 0 -#define VER_X264_BUILD 972 +#define VER_X264_BUILD 978 #define VER_X264_PORTABLE_EDITION (0)