projects: Update for recent upstream merge.

SMP/config.asm

@@ -1540,6 +1540,7 @@
 %define CONFIG_AEMPHASIS_FILTER 1
 %define CONFIG_AEVAL_FILTER 1
 %define CONFIG_AFADE_FILTER 1
+%define CONFIG_AFFTFILT_FILTER 1
 %define CONFIG_AFORMAT_FILTER 1
 %define CONFIG_AGATE_FILTER 1
 %define CONFIG_AINTERLEAVE_FILTER 1
@@ -1628,6 +1629,7 @@
 %define CONFIG_COLORKEY_FILTER 1
 %define CONFIG_COLORLEVELS_FILTER 1
 %define CONFIG_COLORMATRIX_FILTER 1
+%define CONFIG_CONVOLUTION_FILTER 1
 %define CONFIG_COPY_FILTER 1
 %define CONFIG_COVER_RECT_FILTER 1
 %define CONFIG_CROP_FILTER 1

SMP/config.h

@@ -1590,6 +1590,7 @@
 #define CONFIG_AEMPHASIS_FILTER 1
 #define CONFIG_AEVAL_FILTER 1
 #define CONFIG_AFADE_FILTER 1
+#define CONFIG_AFFTFILT_FILTER 1
 #define CONFIG_AFORMAT_FILTER 1
 #define CONFIG_AGATE_FILTER 1
 #define CONFIG_AINTERLEAVE_FILTER 1
@@ -1678,6 +1679,7 @@
 #define CONFIG_COLORKEY_FILTER 1
 #define CONFIG_COLORLEVELS_FILTER 1
 #define CONFIG_COLORMATRIX_FILTER 1
+#define CONFIG_CONVOLUTION_FILTER 1
 #define CONFIG_COPY_FILTER 1
 #define CONFIG_COVER_RECT_FILTER 1
 #define CONFIG_CROP_FILTER 1

SMP/libavfilter.vcxproj

@@ -109,6 +109,8 @@
     <ClCompile Include="..\libavfilter\af_adelay.c" />
     <ClCompile Include="..\libavfilter\af_aecho.c" />
     <ClCompile Include="..\libavfilter\af_aemphasis.c" />
+    <ClCompile Include="..\libavfilter\af_afftfilt.c" />
+    <ClCompile Include="..\libavfilter\window_func.c" />
     <ClCompile Include="..\libavfilter\af_anequalizer.c" />
     <ClCompile Include="..\libavfilter\aeval.c" />
     <ClCompile Include="..\libavfilter\af_aformat.c" />
@@ -187,6 +189,7 @@
     <ClCompile Include="..\libavfilter\vf_colorkey.c" />
     <ClCompile Include="..\libavfilter\vf_colorlevels.c" />
     <ClCompile Include="..\libavfilter\vf_colormatrix.c" />
+    <ClCompile Include="..\libavfilter\vf_convolution.c" />
     <ClCompile Include="..\libavfilter\vf_copy.c" />
     <ClCompile Include="..\libavfilter\vf_cover_rect.c" />
     <ClCompile Include="..\libavfilter\lavfutils.c" />
@@ -333,7 +336,6 @@
     <ClCompile Include="..\libavfilter\avf_concat.c" />
     <ClCompile Include="..\libavfilter\avf_showcqt.c" />
     <ClCompile Include="..\libavfilter\avf_showfreqs.c" />
-    <ClCompile Include="..\libavfilter\window_func.c" />
     <ClCompile Include="..\libavfilter\avf_showspectrum.c" />
     <ClCompile Include="..\libavfilter\avf_showvolume.c" />
     <ClCompile Include="..\libavfilter\avf_showwaves.c" />

SMP/libavfilter.vcxproj.filters

@@ -147,6 +147,12 @@
     <ClCompile Include="..\libavfilter\af_aemphasis.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_afftfilt.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\window_func.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_anequalizer.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -369,6 +375,9 @@
     <ClCompile Include="..\libavfilter\vf_colormatrix.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_convolution.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_copy.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -723,9 +732,6 @@
     <ClCompile Include="..\libavfilter\avf_showfreqs.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\window_func.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\avf_showspectrum.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavutil.def

@@ -257,6 +257,8 @@ EXPORTS
     av_lzo1x_decode
     av_malloc
     av_mallocz
+    av_mastering_display_metadata_alloc
+    av_mastering_display_metadata_create_side_data
     av_match_list
     av_match_name
     av_max_alloc

SMP/libavutil.vcxproj

@@ -119,6 +119,7 @@
     <ClCompile Include="..\libavutil\log.c" />
     <ClCompile Include="..\libavutil\log2_tab.c" />
     <ClCompile Include="..\libavutil\mathematics.c" />
+    <ClCompile Include="..\libavutil\mastering_display_metadata.c" />
     <ClCompile Include="..\libavutil\md5.c" />
     <ClCompile Include="..\libavutil\mem.c" />
     <ClCompile Include="..\libavutil\murmur3.c" />
@@ -196,6 +197,7 @@
     <ClInclude Include="..\libavutil\log.h" />
     <ClInclude Include="..\libavutil\macros.h" />
     <ClInclude Include="..\libavutil\mathematics.h" />
+    <ClInclude Include="..\libavutil\mastering_display_metadata.h" />
     <ClInclude Include="..\libavutil\md5.h" />
     <ClInclude Include="..\libavutil\mem.h" />
     <ClInclude Include="..\libavutil\motion_vector.h" />
@@ -536,6 +538,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -670,6 +673,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -810,6 +814,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -954,6 +959,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -1099,6 +1105,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -1243,6 +1250,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -1388,6 +1396,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -1528,6 +1537,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -1674,6 +1684,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -1819,6 +1830,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -1965,6 +1977,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -2110,6 +2123,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -2250,6 +2264,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil
@@ -2390,6 +2405,7 @@ copy ..\libavutil\lfg.h $(OutDir)\include\libavutil
 copy ..\libavutil\log.h $(OutDir)\include\libavutil
 copy ..\libavutil\macros.h $(OutDir)\include\libavutil
 copy ..\libavutil\mathematics.h $(OutDir)\include\libavutil
+copy ..\libavutil\mastering_display_metadata.h $(OutDir)\include\libavutil
 copy ..\libavutil\md5.h $(OutDir)\include\libavutil
 copy ..\libavutil\mem.h $(OutDir)\include\libavutil
 copy ..\libavutil\motion_vector.h $(OutDir)\include\libavutil

SMP/libavutil.vcxproj.filters

@@ -165,6 +165,9 @@
     <ClCompile Include="..\libavutil\mathematics.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\mastering_display_metadata.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\md5.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
@@ -380,6 +383,9 @@
     <ClInclude Include="..\libavutil\mathematics.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\mastering_display_metadata.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\md5.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>