projects: Update for upstream merge.

Author: Sibras

SMP/SMP.patch

@@ -1,5 +1,5 @@
 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
-index 36fdb567ff..d6f9a20571 100644
+index 4b905bf9da..c3346ac857 100644
 --- a/libavcodec/libx264.c
 +++ b/libavcodec/libx264.c
 @@ -33,10 +33,6 @@

SMP/config.asm

@@ -394,6 +394,7 @@
 %define HAVE_STRUCT_SOCKADDR_STORAGE 1
 %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
+%define HAVE_GZIP 0
 %define HAVE_LIBDRM_GETFB2 0
 %define HAVE_MAKEINFO 0
 %define HAVE_MAKEINFO_HTML 0
@@ -406,6 +407,7 @@
 %define HAVE_PERL 0
 %define HAVE_POD2MAN 0
 %define HAVE_TEXI2HTML 0
+%define HAVE_ZLIB_GZIP 0
 %define CONFIG_DOC 0
 %define CONFIG_HTMLPAGES 0
 %define CONFIG_MANPAGES 0
@@ -614,6 +616,7 @@
 %define CONFIG_NEON_CLOBBER_TEST 0
 %define CONFIG_OSSFUZZ 0
 %define CONFIG_PIC 0
+%define CONFIG_PTX_COMPRESSION 0
 %define CONFIG_THUMB 0
 %define CONFIG_VALGRIND_BACKTRACE 0
 %define CONFIG_XMM_CLOBBER_TEST 0

SMP/config.h

@@ -453,6 +453,7 @@
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
 #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
+#define HAVE_GZIP 0
 #define HAVE_LIBDRM_GETFB2 0
 #define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
@@ -465,6 +466,7 @@
 #define HAVE_PERL 0
 #define HAVE_POD2MAN 0
 #define HAVE_TEXI2HTML 0
+#define HAVE_ZLIB_GZIP 0
 #define CONFIG_DOC 0
 #define CONFIG_HTMLPAGES 0
 #define CONFIG_MANPAGES 0
@@ -685,6 +687,7 @@
 #define CONFIG_NEON_CLOBBER_TEST 0
 #define CONFIG_OSSFUZZ 0
 #define CONFIG_PIC 0
+#define CONFIG_PTX_COMPRESSION 0
 #define CONFIG_THUMB 0
 #define CONFIG_VALGRIND_BACKTRACE 0
 #define CONFIG_XMM_CLOBBER_TEST 0

SMP/libavcodec.vcxproj

@@ -1272,6 +1272,7 @@
     <ClInclude Include="..\libavcodec\codec_id.h" />
     <ClInclude Include="..\libavcodec\codec_par.h" />
     <ClInclude Include="..\libavcodec\d3d11va.h" />
+    <ClInclude Include="..\libavcodec\defs.h" />
     <ClInclude Include="..\libavcodec\dirac.h" />
     <ClInclude Include="..\libavcodec\dv_profile.h" />
     <ClInclude Include="..\libavcodec\dxva2.h" />
@@ -1518,6 +1519,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -1606,6 +1608,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -1701,6 +1704,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -1794,6 +1798,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -1888,6 +1893,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -1980,6 +1986,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -2080,6 +2087,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -2179,6 +2187,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -2279,6 +2288,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec
@@ -2378,6 +2388,7 @@ copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\defs.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dxva2.h "$(OutDir)"\include\libavcodec

SMP/libavcodec.vcxproj.filters

@@ -3326,6 +3326,9 @@
     <ClInclude Include="..\libavcodec\d3d11va.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\defs.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\dirac.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>

SMP/libavformat.def

@@ -149,4 +149,5 @@ EXPORTS
     avpriv_register_devices
     avpriv_set_pts_info
     avpriv_stream_set_need_parsing
+    avpriv_update_cur_dts
     av_format_ffversion DATA

SMP/libavutil.def

@@ -418,6 +418,7 @@ EXPORTS
     av_sha_init
     av_sha_update
     av_shr_i
+    av_size_mult
     av_small_strptime
     av_spherical_alloc
     av_spherical_from_name