From 79de3131a5f72e3ab8c17c1d03f653ed24f06c5d Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Fri, 22 Mar 2019 19:14:34 +1100 Subject: [PATCH] project: Update for recent upstream merge. --- SMP/x264_config.h | 6 +++--- SMP/x264cli.vcxproj | 1 + SMP/x264cli.vcxproj.filters | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SMP/x264_config.h b/SMP/x264_config.h index 76250bb9d..bfaf12c8d 100644 --- a/SMP/x264_config.h +++ b/SMP/x264_config.h @@ -2,7 +2,7 @@ #define X264_GPL 1 #define X264_INTERLACED 1 #define X264_CHROMA_FORMAT 0 -#define X264_REV 2935 +#define X264_REV 2969 #define X264_REV_DIFF 0 -#define X264_VERSION " r2935" -#define X264_POINTVER "0.157.2935" +#define X264_VERSION " r2969" +#define X264_POINTVER "0.157.2969" diff --git a/SMP/x264cli.vcxproj b/SMP/x264cli.vcxproj index 272ed1e6c..ec3cd352a 100644 --- a/SMP/x264cli.vcxproj +++ b/SMP/x264cli.vcxproj @@ -47,6 +47,7 @@ + true true diff --git a/SMP/x264cli.vcxproj.filters b/SMP/x264cli.vcxproj.filters index 77afa2e34..640e1deba 100644 --- a/SMP/x264cli.vcxproj.filters +++ b/SMP/x264cli.vcxproj.filters @@ -140,5 +140,8 @@ Source Files\getopt + + Source Files + \ No newline at end of file