projects: Update for recent upstream merge.

0be1b36d · Matt Oliver · 8f678fc9 · 0be1b36d · 0be1b36d · 0be1b36d
9 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -70,6 +70,7 @@
 %define HAVE_POWER8 0
 %define HAVE_PPC4XX 0
 %define HAVE_VSX 0
+%define HAVE_AESNI 1
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
@@ -111,6 +112,7 @@
 %define HAVE_POWER8_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
 %define HAVE_VSX_EXTERNAL 0
+%define HAVE_AESNI_EXTERNAL 1
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
@@ -152,6 +154,7 @@
 %define HAVE_POWER8_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
 %define HAVE_VSX_INLINE 0
+%define HAVE_AESNI_INLINE 1
 %define HAVE_AMD3DNOW_INLINE 1
 %define HAVE_AMD3DNOWEXT_INLINE 1
 %define HAVE_AVX_INLINE 1
@@ -807,6 +810,7 @@
 %define CONFIG_RL2_DECODER 1
 %define CONFIG_ROQ_DECODER 1
 %define CONFIG_RPZA_DECODER 1
+%define CONFIG_RSCC_DECODER 1
 %define CONFIG_RV10_DECODER 1
 %define CONFIG_RV20_DECODER 1
 %define CONFIG_RV30_DECODER 1
@@ -999,6 +1003,7 @@
 %define CONFIG_ADPCM_4XM_DECODER 1
 %define CONFIG_ADPCM_ADX_DECODER 1
 %define CONFIG_ADPCM_AFC_DECODER 1
+%define CONFIG_ADPCM_AICA_DECODER 1
 %define CONFIG_ADPCM_CT_DECODER 1
 %define CONFIG_ADPCM_DTK_DECODER 1
 %define CONFIG_ADPCM_EA_DECODER 1
@@ -1121,6 +1126,7 @@
 %define CONFIG_CONCAT_DEMUXER 1
 %define CONFIG_DATA_DEMUXER 1
 %define CONFIG_DAUD_DEMUXER 1
+%define CONFIG_DCSTR_DEMUXER 1
 %define CONFIG_DFA_DEMUXER 1
 %define CONFIG_DIRAC_DEMUXER 1
 %define CONFIG_DNXHD_DEMUXER 1
@@ -1278,6 +1284,7 @@
 %define CONFIG_TAK_DEMUXER 1
 %define CONFIG_TEDCAPTIONS_DEMUXER 1
 %define CONFIG_THP_DEMUXER 1
+%define CONFIG_THREEDOSTR_DEMUXER 1
 %define CONFIG_TIERTEXSEQ_DEMUXER 1
 %define CONFIG_TMV_DEMUXER 1
 %define CONFIG_TRUEHD_DEMUXER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -96,6 +96,7 @@
 #define HAVE_POWER8 0
 #define HAVE_PPC4XX 0
 #define HAVE_VSX 0
+#define HAVE_AESNI 1
 #define HAVE_AMD3DNOW 1
 #define HAVE_AMD3DNOWEXT 1
 #define HAVE_AVX 1
@@ -137,6 +138,7 @@
 #define HAVE_POWER8_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
 #define HAVE_VSX_EXTERNAL 0
+#define HAVE_AESNI_EXTERNAL 1
 #define HAVE_AMD3DNOW_EXTERNAL 1
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
@@ -178,6 +180,7 @@
 #define HAVE_POWER8_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
 #define HAVE_VSX_INLINE 0
+#define HAVE_AESNI_INLINE HAVE_INLINE_ASM
 #define HAVE_AMD3DNOW_INLINE HAVE_INLINE_ASM
 #define HAVE_AMD3DNOWEXT_INLINE HAVE_INLINE_ASM
 #define HAVE_AVX_INLINE HAVE_INLINE_ASM
@@ -857,6 +860,7 @@
 #define CONFIG_RL2_DECODER 1
 #define CONFIG_ROQ_DECODER 1
 #define CONFIG_RPZA_DECODER 1
+#define CONFIG_RSCC_DECODER 1
 #define CONFIG_RV10_DECODER 1
 #define CONFIG_RV20_DECODER 1
 #define CONFIG_RV30_DECODER 1
@@ -1049,6 +1053,7 @@
 #define CONFIG_ADPCM_4XM_DECODER 1
 #define CONFIG_ADPCM_ADX_DECODER 1
 #define CONFIG_ADPCM_AFC_DECODER 1
+#define CONFIG_ADPCM_AICA_DECODER 1
 #define CONFIG_ADPCM_CT_DECODER 1
 #define CONFIG_ADPCM_DTK_DECODER 1
 #define CONFIG_ADPCM_EA_DECODER 1
@@ -1171,6 +1176,7 @@
 #define CONFIG_CONCAT_DEMUXER 1
 #define CONFIG_DATA_DEMUXER 1
 #define CONFIG_DAUD_DEMUXER 1
+#define CONFIG_DCSTR_DEMUXER 1
 #define CONFIG_DFA_DEMUXER 1
 #define CONFIG_DIRAC_DEMUXER 1
 #define CONFIG_DNXHD_DEMUXER 1
@@ -1328,6 +1334,7 @@
 #define CONFIG_TAK_DEMUXER 1
 #define CONFIG_TEDCAPTIONS_DEMUXER 1
 #define CONFIG_THP_DEMUXER 1
+#define CONFIG_THREEDOSTR_DEMUXER 1
 #define CONFIG_TIERTEXSEQ_DEMUXER 1
 #define CONFIG_TMV_DEMUXER 1
 #define CONFIG_TRUEHD_DEMUXER 1

--- a/SMP/libavcodec.def
+++ b/SMP/libavcodec.def
@@ -60,7 +60,10 @@ EXPORTS
    av_mdct_end
    av_mdct_init
    av_new_packet
+    av_packet_alloc
+    av_packet_clone
    av_packet_copy_props
+    av_packet_free
    av_packet_free_side_data
    av_packet_from_data
    av_packet_get_side_data

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -696,6 +696,7 @@
    <ClCompile Include="..\libavcodec\roqvideoenc.c" />
    <ClCompile Include="..\libavcodec\roqaudioenc.c" />
    <ClCompile Include="..\libavcodec\rpza.c" />
+    <ClCompile Include="..\libavcodec\rscc.c" />
    <ClCompile Include="..\libavcodec\rv10.c" />
    <ClCompile Include="..\libavcodec\rv10enc.c" />
    <ClCompile Include="..\libavcodec\rv20enc.c" />
@@ -1035,6 +1036,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\libavcodec\avcodec.h" />
+    <ClInclude Include="..\libavcodec\avdct.h" />
    <ClInclude Include="..\libavcodec\avfft.h" />
    <ClInclude Include="..\libavcodec\dv_profile.h" />
    <ClInclude Include="..\libavcodec\d3d11va.h" />
@@ -1318,6 +1320,7 @@
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -1399,6 +1402,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -1486,6 +1490,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -1577,6 +1582,7 @@ echo            These errors are the result of dead code elimination not being p
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -1669,6 +1675,7 @@ echo            These errors are the result of dead code elimination not being p
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -1760,6 +1767,7 @@ echo            These errors are the result of dead code elimination not being p
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -1852,6 +1860,7 @@ echo            These errors are the result of dead code elimination not being p
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -1939,6 +1948,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -2032,6 +2042,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -2124,6 +2135,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -2217,6 +2229,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -2309,6 +2322,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -2396,6 +2410,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec
@@ -2483,6 +2498,7 @@ cd $(ProjectDir)
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\libavcodec
 copy ..\libavcodec\avcodec.h $(OutDir)\include\libavcodec
+copy ..\libavcodec\avdct.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\avfft.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\dv_profile.h $(OutDir)\include\libavcodec
 copy ..\libavcodec\d3d11va.h $(OutDir)\include\libavcodec

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -1734,6 +1734,9 @@
    <ClCompile Include="..\libavcodec\rpza.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\rscc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\rv10.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2651,6 +2654,9 @@
    <ClInclude Include="..\libavcodec\avcodec.h">
      <Filter>Header Files\libavcodec</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavcodec\avdct.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavcodec\avfft.h">
      <Filter>Header Files\libavcodec</Filter>
    </ClInclude>

--- a/SMP/libavformat.def
+++ b/SMP/libavformat.def
@@ -168,9 +168,6 @@ EXPORTS
    ffio_set_buf_size
    ffurl_close
    ffurl_open
-    ffurl_read_complete
-    ffurl_seek
-    ffurl_size
    ffurl_write
    url_feof
    av_format_ffversion DATA
--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -194,6 +194,7 @@
    <ClCompile Include="..\libavformat\dashenc.c" />
    <ClCompile Include="..\libavformat\dauddec.c" />
    <ClCompile Include="..\libavformat\daudenc.c" />
+    <ClCompile Include="..\libavformat\dcstr.c" />
    <ClCompile Include="..\libavformat\dfa.c" />
    <ClCompile Include="..\libavformat\diracdec.c" />
    <ClCompile Include="..\libavformat\dnxhddec.c" />
@@ -414,6 +415,7 @@
    <ClCompile Include="..\libavformat\tedcaptionsdec.c" />
    <ClCompile Include="..\libavformat\tee.c" />
    <ClCompile Include="..\libavformat\thp.c" />
+    <ClCompile Include="..\libavformat\3dostr.c" />
    <ClCompile Include="..\libavformat\tiertexseq.c" />
    <ClCompile Include="..\libavformat\mkvtimestamp_v2.c" />
    <ClCompile Include="..\libavformat\tmv.c" />

--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -403,6 +403,9 @@
    <ClCompile Include="..\libavformat\daudenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\dcstr.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\dfa.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -1063,6 +1066,9 @@
    <ClCompile Include="..\libavformat\thp.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\3dostr.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\tiertexseq.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>

--- a/SMP/libswscale.def
+++ b/SMP/libswscale.def
@@ -25,7 +25,6 @@ EXPORTS
    sws_isSupportedOutput
    sws_normalizeVec
    sws_printVec2
-    sws_rgb2rgb_init
    sws_scale
    sws_scaleVec
    sws_setColorspaceDetails
@@ -34,4 +33,3 @@ EXPORTS
    swscale_configuration
    swscale_license
    swscale_version
-    sws_context_class DATA