project: Update for recent upstream merge.

ShiftMediaProject · Feb 17, 2019 · 4b6946f · 4b6946f
1 parent 9c81c7e
commit 4b6946f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -441,6 +441,7 @@
 %define CONFIG_OPENSSL 0
 %define CONFIG_LIBTLS 0
 %define CONFIG_GMP 0
+%define CONFIG_LIBARIBB24 0
 %define CONFIG_LIBLENSFUN 0
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
@@ -736,6 +737,7 @@
 %define CONFIG_ANM_DECODER 1
 %define CONFIG_ANSI_DECODER 1
 %define CONFIG_APNG_DECODER 1
+%define CONFIG_ARBC_DECODER 1
 %define CONFIG_ASV1_DECODER 1
 %define CONFIG_ASV2_DECODER 1
 %define CONFIG_AURA_DECODER 1
@@ -1203,6 +1205,7 @@
 %define CONFIG_QDMC_AT_DECODER 0
 %define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBAOM_AV1_DECODER 0
+%define CONFIG_LIBARIBB24_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
 %define CONFIG_LIBCODEC2_DECODER 0
 %define CONFIG_LIBDAV1D_DECODER 0

diff --git a/SMP/config.h b/SMP/config.h
@@ -491,6 +491,7 @@
 #define CONFIG_OPENSSL 0
 #define CONFIG_LIBTLS 0
 #define CONFIG_GMP 0
+#define CONFIG_LIBARIBB24 0
 #define CONFIG_LIBLENSFUN 0
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
@@ -801,6 +802,7 @@
 #define CONFIG_ANM_DECODER 1
 #define CONFIG_ANSI_DECODER 1
 #define CONFIG_APNG_DECODER 1
+#define CONFIG_ARBC_DECODER 1
 #define CONFIG_ASV1_DECODER 1
 #define CONFIG_ASV2_DECODER 1
 #define CONFIG_AURA_DECODER 1
@@ -1268,6 +1270,7 @@
 #define CONFIG_QDMC_AT_DECODER 0
 #define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBAOM_AV1_DECODER 0
+#define CONFIG_LIBARIBB24_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
 #define CONFIG_LIBCODEC2_DECODER 0
 #define CONFIG_LIBDAV1D_DECODER 0

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -272,7 +272,6 @@
     <ClCompile Include="..\libavcodec\ratecontrol.c" />
     <ClCompile Include="..\libavcodec\mss34dsp.c" />
     <ClCompile Include="..\libavcodec\nvenc.c" />
-    <ClCompile Include="..\libavcodec\cuda_check.c" />
     <ClCompile Include="..\libavcodec\qsv.c" />
     <ClCompile Include="..\libavcodec\qsvdec.c" />
     <ClCompile Include="..\libavcodec\qsvenc.c" />
@@ -348,6 +347,7 @@
     <ClCompile Include="..\libavcodec\png.c" />
     <ClCompile Include="..\libavcodec\pngdec.c" />
     <ClCompile Include="..\libavcodec\pngenc.c" />
+    <ClCompile Include="..\libavcodec\arbc.c" />
     <ClCompile Include="..\libavcodec\assdec.c" />
     <ClCompile Include="..\libavcodec\ass.c" />
     <ClCompile Include="..\libavcodec\assenc.c" />

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -639,9 +639,6 @@
     <ClCompile Include="..\libavcodec\nvenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavcodec\cuda_check.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavcodec\qsv.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -867,6 +864,9 @@
     <ClCompile Include="..\libavcodec\pngenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\arbc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\assdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
@@ -203,6 +203,7 @@ static const AVCodec *codec_list[] = {
     &ff_anm_decoder,
     &ff_ansi_decoder,
     &ff_apng_decoder,
+    &ff_arbc_decoder,
     &ff_asv1_decoder,
     &ff_asv2_decoder,
     &ff_aura_decoder,

diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
@@ -3578,8 +3578,10 @@ void ff_vp3dsp_init_arm(VP3DSPContext *c, int flags) {return;}
 void ff_vp3dsp_init_mips(VP3DSPContext *c, int flags) {return;}
 void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags) {return;}
 void ff_vp6dsp_init_arm(VP56DSPContext *s) {return;}
+void ff_vp78dsp_init_aarch64(VP8DSPContext *c) {return;}
 void ff_vp78dsp_init_arm(VP8DSPContext *c) {return;}
 void ff_vp78dsp_init_ppc(VP8DSPContext *c) {return;}
+void ff_vp8dsp_init_aarch64(VP8DSPContext *c) {return;}
 void ff_vp8dsp_init_arm(VP8DSPContext *c) {return;}
 void ff_vp8dsp_init_mips(VP8DSPContext *c) {return;}
 #if !(ARCH_X86_64)

diff --git a/SMP/libavutil.vcxproj b/SMP/libavutil.vcxproj
@@ -143,7 +143,6 @@
     <ClCompile Include="..\libavutil\xtea.c" />
     <ClCompile Include="..\libavutil\tea.c" />
     <ClCompile Include="..\libavutil\hwcontext_cuda.c" />
-    <ClCompile Include="..\libavutil\cuda_check.c" />
     <ClCompile Include="..\libavutil\hwcontext_dxva2.c" />
     <ClCompile Include="..\libavutil\lzo.c" />
     <ClCompile Include="..\libavutil\hwcontext_qsv.c" />

diff --git a/SMP/libavutil.vcxproj.filters b/SMP/libavutil.vcxproj.filters
@@ -258,9 +258,6 @@
     <ClCompile Include="..\libavutil\hwcontext_cuda.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavutil\cuda_check.c">
-      <Filter>Source Files\libavutil</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavutil\hwcontext_dxva2.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>