projects: Update for recent upstream merge.

ShiftMediaProject · Sep 7, 2020 · ca622c8 · ca622c8
1 parent f0bc17f
commit ca622c8
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 9 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -1,10 +1,10 @@
 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
-index 7bbeab7d4c..8907d7bc4b 100644
+index ca7cc3a540..99702894d2 100644
 --- a/libavcodec/libx264.c
 +++ b/libavcodec/libx264.c
-@@ -31,10 +31,6 @@
- #include "internal.h"
+@@ -32,10 +32,6 @@
  #include "packet_internal.h"
+ #include "atsc_a53.h"
 
 -#if defined(_MSC_VER)
 -#define X264_API_IMPORTS 1

diff --git a/SMP/config.asm b/SMP/config.asm
@@ -395,6 +395,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_LIBDRM_GETFB2 0
 %define HAVE_MAKEINFO 0
 %define HAVE_MAKEINFO_HTML 0
 %define HAVE_OPENCL_D3D11 0
@@ -631,6 +632,7 @@
 %define CONFIG_AANDCTTABLES 1
 %define CONFIG_AC3DSP 1
 %define CONFIG_ADTS_HEADER 1
+%define CONFIG_ATSC_A53 1
 %define CONFIG_AUDIO_FRAME_QUEUE 1
 %define CONFIG_AUDIODSP 1
 %define CONFIG_BLOCKDSP 1
@@ -876,6 +878,7 @@
 %define CONFIG_MJPEG_DECODER 1
 %define CONFIG_MJPEGB_DECODER 1
 %define CONFIG_MMVIDEO_DECODER 1
+%define CONFIG_MOBICLIP_DECODER 1
 %define CONFIG_MOTIONPIXELS_DECODER 1
 %define CONFIG_MPEG1VIDEO_DECODER 1
 %define CONFIG_MPEG2VIDEO_DECODER 1
@@ -919,6 +922,7 @@
 %define CONFIG_PGM_DECODER 1
 %define CONFIG_PGMYUV_DECODER 1
 %define CONFIG_PGX_DECODER 1
+%define CONFIG_PHOTOCD_DECODER 1
 %define CONFIG_PICTOR_DECODER 1
 %define CONFIG_PIXLET_DECODER 1
 %define CONFIG_PNG_DECODER 1
@@ -1063,6 +1067,7 @@
 %define CONFIG_DST_DECODER 1
 %define CONFIG_EAC3_DECODER 1
 %define CONFIG_EVRC_DECODER 1
+%define CONFIG_FASTAUDIO_DECODER 1
 %define CONFIG_FFWAVESYNTH_DECODER 1
 %define CONFIG_FLAC_DECODER 1
 %define CONFIG_G723_1_DECODER 1
@@ -1192,6 +1197,7 @@
 %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1
 %define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 1
 %define CONFIG_ADPCM_IMA_ISS_DECODER 1
+%define CONFIG_ADPCM_IMA_MOFLEX_DECODER 1
 %define CONFIG_ADPCM_IMA_MTF_DECODER 1
 %define CONFIG_ADPCM_IMA_OKI_DECODER 1
 %define CONFIG_ADPCM_IMA_QT_DECODER 1
@@ -1301,6 +1307,7 @@
 %define CONFIG_AVUI_ENCODER 1
 %define CONFIG_AYUV_ENCODER 1
 %define CONFIG_BMP_ENCODER 1
+%define CONFIG_CFHD_ENCODER 1
 %define CONFIG_CINEPAK_ENCODER 1
 %define CONFIG_CLJR_ENCODER 1
 %define CONFIG_COMFORTNOISE_ENCODER 1
@@ -1345,6 +1352,7 @@
 %define CONFIG_R210_ENCODER 1
 %define CONFIG_RAWVIDEO_ENCODER 1
 %define CONFIG_ROQ_ENCODER 1
+%define CONFIG_RPZA_ENCODER 1
 %define CONFIG_RV10_ENCODER 1
 %define CONFIG_RV20_ENCODER 1
 %define CONFIG_S302M_ENCODER 1
@@ -1427,6 +1435,7 @@
 %define CONFIG_PCM_VIDC_ENCODER 1
 %define CONFIG_ROQ_DPCM_ENCODER 1
 %define CONFIG_ADPCM_ADX_ENCODER 1
+%define CONFIG_ADPCM_ARGO_ENCODER 1
 %define CONFIG_ADPCM_G722_ENCODER 1
 %define CONFIG_ADPCM_G726_ENCODER 1
 %define CONFIG_ADPCM_G726LE_ENCODER 1
@@ -2255,6 +2264,8 @@
 %define CONFIG_MLV_DEMUXER 1
 %define CONFIG_MM_DEMUXER 1
 %define CONFIG_MMF_DEMUXER 1
+%define CONFIG_MODS_DEMUXER 1
+%define CONFIG_MOFLEX_DEMUXER 1
 %define CONFIG_MOV_DEMUXER 1
 %define CONFIG_MP3_DEMUXER 1
 %define CONFIG_MPC_DEMUXER 1
@@ -2281,6 +2292,7 @@
 %define CONFIG_NSV_DEMUXER 1
 %define CONFIG_NUT_DEMUXER 1
 %define CONFIG_NUV_DEMUXER 1
+%define CONFIG_OBU_DEMUXER 1
 %define CONFIG_OGG_DEMUXER 1
 %define CONFIG_OMA_DEMUXER 1
 %define CONFIG_PAF_DEMUXER 1
@@ -2408,6 +2420,7 @@
 %define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PGX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
@@ -2434,6 +2447,7 @@
 %define CONFIG_APNG_MUXER 1
 %define CONFIG_APTX_MUXER 1
 %define CONFIG_APTX_HD_MUXER 1
+%define CONFIG_ARGO_ASF_MUXER 1
 %define CONFIG_ASF_MUXER 1
 %define CONFIG_ASS_MUXER 1
 %define CONFIG_AST_MUXER 1

diff --git a/SMP/config.h b/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_LIBDRM_GETFB2 0
 #define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
 #define HAVE_OPENCL_D3D11 0
@@ -701,6 +702,7 @@
 #define CONFIG_AANDCTTABLES 1
 #define CONFIG_AC3DSP 1
 #define CONFIG_ADTS_HEADER 1
+#define CONFIG_ATSC_A53 1
 #define CONFIG_AUDIO_FRAME_QUEUE 1
 #define CONFIG_AUDIODSP 1
 #define CONFIG_BLOCKDSP 1
@@ -946,6 +948,7 @@
 #define CONFIG_MJPEG_DECODER 1
 #define CONFIG_MJPEGB_DECODER 1
 #define CONFIG_MMVIDEO_DECODER 1
+#define CONFIG_MOBICLIP_DECODER 1
 #define CONFIG_MOTIONPIXELS_DECODER 1
 #define CONFIG_MPEG1VIDEO_DECODER 1
 #define CONFIG_MPEG2VIDEO_DECODER 1
@@ -989,6 +992,7 @@
 #define CONFIG_PGM_DECODER 1
 #define CONFIG_PGMYUV_DECODER 1
 #define CONFIG_PGX_DECODER 1
+#define CONFIG_PHOTOCD_DECODER 1
 #define CONFIG_PICTOR_DECODER 1
 #define CONFIG_PIXLET_DECODER 1
 #define CONFIG_PNG_DECODER 1
@@ -1133,6 +1137,7 @@
 #define CONFIG_DST_DECODER 1
 #define CONFIG_EAC3_DECODER 1
 #define CONFIG_EVRC_DECODER 1
+#define CONFIG_FASTAUDIO_DECODER 1
 #define CONFIG_FFWAVESYNTH_DECODER 1
 #define CONFIG_FLAC_DECODER 1
 #define CONFIG_G723_1_DECODER 1
@@ -1262,6 +1267,7 @@
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1
 #define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 1
 #define CONFIG_ADPCM_IMA_ISS_DECODER 1
+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 1
 #define CONFIG_ADPCM_IMA_MTF_DECODER 1
 #define CONFIG_ADPCM_IMA_OKI_DECODER 1
 #define CONFIG_ADPCM_IMA_QT_DECODER 1
@@ -1371,6 +1377,7 @@
 #define CONFIG_AVUI_ENCODER 1
 #define CONFIG_AYUV_ENCODER 1
 #define CONFIG_BMP_ENCODER 1
+#define CONFIG_CFHD_ENCODER 1
 #define CONFIG_CINEPAK_ENCODER 1
 #define CONFIG_CLJR_ENCODER 1
 #define CONFIG_COMFORTNOISE_ENCODER 1
@@ -1415,6 +1422,7 @@
 #define CONFIG_R210_ENCODER 1
 #define CONFIG_RAWVIDEO_ENCODER 1
 #define CONFIG_ROQ_ENCODER 1
+#define CONFIG_RPZA_ENCODER 1
 #define CONFIG_RV10_ENCODER 1
 #define CONFIG_RV20_ENCODER 1
 #define CONFIG_S302M_ENCODER 1
@@ -1497,6 +1505,7 @@
 #define CONFIG_PCM_VIDC_ENCODER 1
 #define CONFIG_ROQ_DPCM_ENCODER 1
 #define CONFIG_ADPCM_ADX_ENCODER 1
+#define CONFIG_ADPCM_ARGO_ENCODER 1
 #define CONFIG_ADPCM_G722_ENCODER 1
 #define CONFIG_ADPCM_G726_ENCODER 1
 #define CONFIG_ADPCM_G726LE_ENCODER 1
@@ -2377,6 +2386,8 @@
 #define CONFIG_MLV_DEMUXER 1
 #define CONFIG_MM_DEMUXER 1
 #define CONFIG_MMF_DEMUXER 1
+#define CONFIG_MODS_DEMUXER 1
+#define CONFIG_MOFLEX_DEMUXER 1
 #define CONFIG_MOV_DEMUXER 1
 #define CONFIG_MP3_DEMUXER 1
 #define CONFIG_MPC_DEMUXER 1
@@ -2403,6 +2414,7 @@
 #define CONFIG_NSV_DEMUXER 1
 #define CONFIG_NUT_DEMUXER 1
 #define CONFIG_NUV_DEMUXER 1
+#define CONFIG_OBU_DEMUXER 1
 #define CONFIG_OGG_DEMUXER 1
 #define CONFIG_OMA_DEMUXER 1
 #define CONFIG_PAF_DEMUXER 1
@@ -2530,6 +2542,7 @@
 #define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PGX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
@@ -2556,6 +2569,7 @@
 #define CONFIG_APNG_MUXER 1
 #define CONFIG_APTX_MUXER 1
 #define CONFIG_APTX_HD_MUXER 1
+#define CONFIG_ARGO_ASF_MUXER 1
 #define CONFIG_ASF_MUXER 1
 #define CONFIG_ASS_MUXER 1
 #define CONFIG_AST_MUXER 1

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -114,6 +114,7 @@
     <NASM Include="..\libavcodec\x86\alacdsp.asm" />
     <NASM Include="..\libavcodec\x86\pngdsp.asm" />
     <NASM Include="..\libavcodec\x86\cavsidct.asm" />
+    <NASM Include="..\libavcodec\x86\cfhddsp.asm" />
     <NASM Include="..\libavcodec\x86\dcadsp.asm" />
     <NASM Include="..\libavcodec\x86\synth_filter.asm" />
     <NASM Include="..\libavcodec\x86\diracdsp.asm" />
@@ -192,6 +193,7 @@
     <ClCompile Include="..\libavcodec\mpeg4audio.c" />
     <ClCompile Include="..\libavcodec\amfenc.c" />
     <ClCompile Include="..\libavcodec\audio_frame_queue.c" />
+    <ClCompile Include="..\libavcodec\atsc_a53.c" />
     <ClCompile Include="..\libavcodec\cabac.c" />
     <ClCompile Include="..\libavcodec\cbs.c" />
     <ClCompile Include="..\libavcodec\cbs_av1.c" />
@@ -394,6 +396,7 @@
     <ClCompile Include="..\libavcodec\cdxl.c" />
     <ClCompile Include="..\libavcodec\cfhd.c" />
     <ClCompile Include="..\libavcodec\cfhddata.c" />
+    <ClCompile Include="..\libavcodec\cfhdenc.c" />
     <ClCompile Include="..\libavcodec\cinepak.c" />
     <ClCompile Include="..\libavcodec\cinepakenc.c" />
     <ClCompile Include="..\libavcodec\clearvideo.c" />
@@ -436,7 +439,7 @@
     <ClCompile Include="..\libavcodec\dss_sp.c" />
     <ClCompile Include="..\libavcodec\dstdec.c" />
     <ClCompile Include="..\libavcodec\dvbsubdec.c" />
-    <ClCompile Include="..\libavcodec\dvbsub.c" />
+    <ClCompile Include="..\libavcodec\dvbsubenc.c" />
     <ClCompile Include="..\libavcodec\dvdsubdec.c" />
     <ClCompile Include="..\libavcodec\dvdsub.c" />
     <ClCompile Include="..\libavcodec\dvdsubenc.c" />
@@ -463,6 +466,7 @@
     <ClCompile Include="..\libavcodec\escape130.c" />
     <ClCompile Include="..\libavcodec\evrcdec.c" />
     <ClCompile Include="..\libavcodec\exr.c" />
+    <ClCompile Include="..\libavcodec\fastaudio.c" />
     <ClCompile Include="..\libavcodec\ffv1dec.c" />
     <ClCompile Include="..\libavcodec\ffv1.c" />
     <ClCompile Include="..\libavcodec\ffv1enc.c" />
@@ -601,6 +605,7 @@
     <ClCompile Include="..\libavcodec\mlpenc.c" />
     <ClCompile Include="..\libavcodec\mlp.c" />
     <ClCompile Include="..\libavcodec\mmvideo.c" />
+    <ClCompile Include="..\libavcodec\mobiclip.c" />
     <ClCompile Include="..\libavcodec\motionpixels.c" />
     <ClCompile Include="..\libavcodec\movtextdec.c" />
     <ClCompile Include="..\libavcodec\movtextenc.c" />
@@ -664,6 +669,7 @@
     <ClCompile Include="..\libavcodec\pcxenc.c" />
     <ClCompile Include="..\libavcodec\pgssubdec.c" />
     <ClCompile Include="..\libavcodec\pgxdec.c" />
+    <ClCompile Include="..\libavcodec\photocd.c" />
     <ClCompile Include="..\libavcodec\pictordec.c" />
     <ClCompile Include="..\libavcodec\pixlet.c" />
     <ClCompile Include="..\libavcodec\textdec.c" />
@@ -696,6 +702,7 @@
     <ClCompile Include="..\libavcodec\roqvideoenc.c" />
     <ClCompile Include="..\libavcodec\roqaudioenc.c" />
     <ClCompile Include="..\libavcodec\rpza.c" />
+    <ClCompile Include="..\libavcodec\rpzaenc.c" />
     <ClCompile Include="..\libavcodec\rscc.c" />
     <ClCompile Include="..\libavcodec\rv10.c" />
     <ClCompile Include="..\libavcodec\rv10enc.c" />
@@ -864,11 +871,11 @@
     <ClCompile Include="..\libavcodec\adxdec.c" />
     <ClCompile Include="..\libavcodec\adx.c" />
     <ClCompile Include="..\libavcodec\adxenc.c" />
+    <ClCompile Include="..\libavcodec\adpcmenc.c" />
     <ClCompile Include="..\libavcodec\g722.c" />
     <ClCompile Include="..\libavcodec\g722dec.c" />
     <ClCompile Include="..\libavcodec\g722enc.c" />
     <ClCompile Include="..\libavcodec\g726.c" />
-    <ClCompile Include="..\libavcodec\adpcmenc.c" />
     <ClCompile Include="..\libavcodec\vima.c" />
     <ClCompile Include="..\libavcodec\dxva2.c" />
     <ClCompile Include="..\libavcodec\nvdec.c" />
@@ -1031,6 +1038,7 @@
     <ClCompile Include="..\libavcodec\x86\g722dsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\alacdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\pngdsp_init.c" />
+    <ClCompile Include="..\libavcodec\x86\cfhddsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\dcadsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\synth_filter_init.c" />
     <ClCompile Include="..\libavcodec\x86\dnxhdenc_init.c" />
@@ -1143,6 +1151,9 @@
     <ClCompile Include="..\libavcodec\pngdsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_pngdsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\cfhddsp.c">
+      <ObjectFileName>$(IntDir)\libavcodec_cfhddsp.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\dcadsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_dcadsp.obj</ObjectFileName>
     </ClCompile>