From dc4cc210bd13e9aada8e3bcaee6ea0f3f56acc1a Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Tue, 18 Jan 2022 00:41:19 +1100
Subject: [PATCH] project: Update for upstream merge.

---
 SMP/appveyor.yml  | 2 +-
 SMP/x264_config.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SMP/appveyor.yml b/SMP/appveyor.yml
index b28f4462b..f9d4ecaf1 100644
--- a/SMP/appveyor.yml
+++ b/SMP/appveyor.yml
@@ -119,7 +119,7 @@ before_build:
     }
 
 # Download and install nasm integration
-- ps: (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSNASM/releases/download/0.6/VSNASM.zip', "$pwd\nasm.zip")
+- ps: (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSNASM/releases/download/0.8/VSNASM.zip', "$pwd\nasm.zip")
 - ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\nasm.zip", "$pwd\TempNASMUnpack")
 - cmd: call ".\TempNASMUnpack\install_script.bat"
 # Additional nasm location in order to fix gitlink error
diff --git a/SMP/x264_config.h b/SMP/x264_config.h
index 51d647e1b..3f55e7269 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 3075
+#define X264_REV 3081
 #define X264_REV_DIFF 0
-#define X264_VERSION " r3075"
-#define X264_POINTVER "0.164.3075"
+#define X264_VERSION " r3081"
+#define X264_POINTVER "0.164.3081"