From d782e4f2b120fa002042e103bf0974663db4e83a Mon Sep 17 00:00:00 2001 From: lordmulder Date: Thu, 14 Apr 2016 20:58:35 +0200 Subject: [PATCH] Bump x264 version. --- HISTORY.txt | 4 ++++ src/encoder_x264.cpp | 2 +- src/version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HISTORY.txt b/HISTORY.txt index b3fe7a7..5cffa03 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -2,6 +2,10 @@ Simple x264/x265 Launcher version history ----------------------------------------- +Version 2.69 [2016-04-??] +* Updated x264 to revision 2692 +* Updated x265 to version 1.9+125 + Version 2.68 [2016-04-09] * Updated build environment to Visual Studio 2015 with Update-2 * Updated x265 to version 1.9+106 diff --git a/src/encoder_x264.cpp b/src/encoder_x264.cpp index e13ec37..ce1a957 100644 --- a/src/encoder_x264.cpp +++ b/src/encoder_x264.cpp @@ -37,7 +37,7 @@ #include //x264 version info -static const unsigned int VERSION_X264_MINIMUM_REV = 2643; +static const unsigned int VERSION_X264_MINIMUM_REV = 2668; static const unsigned int VERSION_X264_CURRENT_API = 148; // ------------------------------------------------------------ diff --git a/src/version.h b/src/version.h index 66b80a6..0015947 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 8 -#define VER_X264_BUILD 1018 +#define VER_X264_BUILD 1020 #define VER_X264_PORTABLE_EDITION (0)