From 6665ae04e8cbf805bc467247c7fab43c109f22eb Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Mon, 5 Feb 2018 02:30:55 +1100
Subject: [PATCH] projects: Update for recent upstream merge.

---
 SMP/config.asm                  |  1 +
 SMP/config.h                    |  1 +
 SMP/libavfilter.vcxproj         |  6 +++++-
 SMP/libavfilter.vcxproj.filters | 12 +++++++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/SMP/config.asm b/SMP/config.asm
index a3cd47299f..1701c5255d 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -420,6 +420,7 @@
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 %define CONFIG_TRANSCODING_EXAMPLE 0
 %define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
 %define CONFIG_AVISYNTH 1
 %define CONFIG_FREI0R 0
 %define CONFIG_LIBCDIO 1
diff --git a/SMP/config.h b/SMP/config.h
index 77d593e802..d69f89d3aa 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -470,6 +470,7 @@
 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 #define CONFIG_TRANSCODING_EXAMPLE 0
 #define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
 #define CONFIG_AVISYNTH 1
 #define CONFIG_FREI0R 0
 #define CONFIG_LIBCDIO 1
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index a5e5023b12..e50af73aee 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -73,6 +73,7 @@
     <NASM Include="..\libavfilter\x86\vf_blend.asm" />
     <NASM Include="..\libavfilter\x86\vf_bwdif.asm" />
     <NASM Include="..\libavfilter\x86\colorspacedsp.asm" />
+    <NASM Include="..\libavfilter\x86\vf_framerate.asm" />
     <NASM Include="..\libavfilter\x86\vf_fspp.asm" />
     <NASM Include="..\libavfilter\x86\vf_gradfun.asm" />
     <NASM Include="..\libavfilter\x86\vf_hflip.asm" />
@@ -256,7 +257,6 @@
     <ClCompile Include="..\libavfilter\vf_format.c" />
     <ClCompile Include="..\libavfilter\vf_fps.c" />
     <ClCompile Include="..\libavfilter\vf_framepack.c" />
-    <ClCompile Include="..\libavfilter\vf_framerate.c" />
     <ClCompile Include="..\libavfilter\vf_framestep.c" />
     <ClCompile Include="..\libavfilter\vf_gblur.c" />
     <ClCompile Include="..\libavfilter\vf_geq.c" />
@@ -372,6 +372,7 @@
     <ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_fspp_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c" />
+    <ClCompile Include="..\libavfilter\x86\vf_framerate_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_hflip_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_hqdn3d_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_idet_init.c" />
@@ -407,6 +408,9 @@
     <ClCompile Include="..\libavfilter\colorspacedsp.c">
       <ObjectFileName>$(IntDir)\libavfilter_colorspacedsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_framerate.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_framerate.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fspp.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_fspp.obj</ObjectFileName>
     </ClCompile>
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 84439e8e4c..4ed96bb6c2 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -46,6 +46,9 @@
     <NASM Include="..\libavfilter\x86\colorspacedsp.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </NASM>
+    <NASM Include="..\libavfilter\x86\vf_framerate.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </NASM>
     <NASM Include="..\libavfilter\x86\vf_fspp.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </NASM>
@@ -591,9 +594,6 @@
     <ClCompile Include="..\libavfilter\vf_framepack.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_framerate.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_framestep.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -939,6 +939,9 @@
     <ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_framerate_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_hflip_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
@@ -1014,6 +1017,9 @@
     <ClCompile Include="..\libavfilter\colorspacedsp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_framerate.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_fspp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-- 
GitLab