Skip to content

Commit 766c020

Browse files
SibrasSibras
committed
projects: Update for upstream merge.
1 parent 45aa286 commit 766c020

29 files changed

+97
-311
lines changed

‎SMP/SMP.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
2-
index 4ddc4973a4..0152d3084e 100644
2+
index 36fdb567ff..d6f9a20571 100644
33
--- a/libavcodec/libx264.c
44
+++ b/libavcodec/libx264.c
5-
@@ -32,10 +32,6 @@
5+
@@ -33,10 +33,6 @@
66
#include "packet_internal.h"
77
#include "atsc_a53.h"
88

‎SMP/config.asm‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
%define HAVE_MIPSDSP 0
9595
%define HAVE_MIPSDSPR2 0
9696
%define HAVE_MSA 0
97-
%define HAVE_MSA2 0
9897
%define HAVE_LOONGSON2 0
9998
%define HAVE_LOONGSON3 0
10099
%define HAVE_MMI 0
@@ -140,7 +139,6 @@
140139
%define HAVE_MIPSDSP_EXTERNAL 0
141140
%define HAVE_MIPSDSPR2_EXTERNAL 0
142141
%define HAVE_MSA_EXTERNAL 0
143-
%define HAVE_MSA2_EXTERNAL 0
144142
%define HAVE_LOONGSON2_EXTERNAL 0
145143
%define HAVE_LOONGSON3_EXTERNAL 0
146144
%define HAVE_MMI_EXTERNAL 0
@@ -186,7 +184,6 @@
186184
%define HAVE_MIPSDSP_INLINE 0
187185
%define HAVE_MIPSDSPR2_INLINE 0
188186
%define HAVE_MSA_INLINE 0
189-
%define HAVE_MSA2_INLINE 0
190187
%define HAVE_LOONGSON2_INLINE 0
191188
%define HAVE_LOONGSON3_INLINE 0
192189
%define HAVE_MMI_INLINE 0
@@ -593,7 +590,6 @@
593590
%define CONFIG_AVFORMAT 1
594591
%define CONFIG_AVCODEC 1
595592
%define CONFIG_SWRESAMPLE 1
596-
%define CONFIG_AVRESAMPLE 0
597593
%define CONFIG_AVUTIL 1
598594
%define CONFIG_FFPLAY 1
599595
%define CONFIG_FFPROBE 1
@@ -1197,6 +1193,7 @@
11971193
%define CONFIG_ADPCM_G722_DECODER 1
11981194
%define CONFIG_ADPCM_G726_DECODER 1
11991195
%define CONFIG_ADPCM_G726LE_DECODER 1
1196+
%define CONFIG_ADPCM_IMA_ACORN_DECODER 1
12001197
%define CONFIG_ADPCM_IMA_AMV_DECODER 1
12011198
%define CONFIG_ADPCM_IMA_ALP_DECODER 1
12021199
%define CONFIG_ADPCM_IMA_APC_DECODER 1
@@ -1463,6 +1460,7 @@
14631460
%define CONFIG_ADPCM_IMA_QT_ENCODER 1
14641461
%define CONFIG_ADPCM_IMA_SSI_ENCODER 1
14651462
%define CONFIG_ADPCM_IMA_WAV_ENCODER 1
1463+
%define CONFIG_ADPCM_IMA_WS_ENCODER 1
14661464
%define CONFIG_ADPCM_MS_ENCODER 1
14671465
%define CONFIG_ADPCM_SWF_ENCODER 1
14681466
%define CONFIG_ADPCM_YAMAHA_ENCODER 1
@@ -1523,9 +1521,6 @@
15231521
%define CONFIG_H264_V4L2M2M_ENCODER 0
15241522
%define CONFIG_H264_VAAPI_ENCODER 0
15251523
%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
1526-
%define CONFIG_NVENC_ENCODER 1
1527-
%define CONFIG_NVENC_H264_ENCODER 1
1528-
%define CONFIG_NVENC_HEVC_ENCODER 1
15291524
%define CONFIG_HEVC_AMF_ENCODER 1
15301525
%define CONFIG_HEVC_MF_ENCODER 1
15311526
%define CONFIG_HEVC_NVENC_ENCODER 1
@@ -1795,7 +1790,6 @@
17951790
%define CONFIG_MCOMPAND_FILTER 1
17961791
%define CONFIG_PAN_FILTER 1
17971792
%define CONFIG_REPLAYGAIN_FILTER 1
1798-
%define CONFIG_RESAMPLE_FILTER 0
17991793
%define CONFIG_RUBBERBAND_FILTER 0
18001794
%define CONFIG_SIDECHAINCOMPRESS_FILTER 1
18011795
%define CONFIG_SIDECHAINGATE_FILTER 1
@@ -1893,6 +1887,7 @@
18931887
%define CONFIG_DILATION_FILTER 1
18941888
%define CONFIG_DILATION_OPENCL_FILTER 0
18951889
%define CONFIG_DISPLACE_FILTER 1
1890+
%define CONFIG_DNN_CLASSIFY_FILTER 1
18961891
%define CONFIG_DNN_DETECT_FILTER 1
18971892
%define CONFIG_DNN_PROCESSING_FILTER 1
18981893
%define CONFIG_DOUBLEWEAVE_FILTER 1
@@ -1934,6 +1929,7 @@
19341929
%define CONFIG_GRADFUN_FILTER 1
19351930
%define CONFIG_GRAPHMONITOR_FILTER 1
19361931
%define CONFIG_GREYEDGE_FILTER 1
1932+
%define CONFIG_GUIDED_FILTER 1
19371933
%define CONFIG_HALDCLUT_FILTER 1
19381934
%define CONFIG_HFLIP_FILTER 1
19391935
%define CONFIG_HISTEQ_FILTER 1
@@ -1974,7 +1970,7 @@
19741970
%define CONFIG_MASKEDMIN_FILTER 1
19751971
%define CONFIG_MASKEDTHRESHOLD_FILTER 1
19761972
%define CONFIG_MASKFUN_FILTER 1
1977-
%define CONFIG_MCDEINT_FILTER 1
1973+
%define CONFIG_MCDEINT_FILTER 0
19781974
%define CONFIG_MEDIAN_FILTER 1
19791975
%define CONFIG_MERGEPLANES_FILTER 1
19801976
%define CONFIG_MESTIMATE_FILTER 1
@@ -2105,7 +2101,7 @@
21052101
%define CONFIG_UNSHARP_FILTER 1
21062102
%define CONFIG_UNSHARP_OPENCL_FILTER 0
21072103
%define CONFIG_UNTILE_FILTER 1
2108-
%define CONFIG_USPP_FILTER 1
2104+
%define CONFIG_USPP_FILTER 0
21092105
%define CONFIG_V360_FILTER 1
21102106
%define CONFIG_VAGUEDENOISER_FILTER 1
21112107
%define CONFIG_VECTORSCOPE_FILTER 1
@@ -2205,6 +2201,7 @@
22052201
%define CONFIG_AQTITLE_DEMUXER 1
22062202
%define CONFIG_ARGO_ASF_DEMUXER 1
22072203
%define CONFIG_ARGO_BRP_DEMUXER 1
2204+
%define CONFIG_ARGO_CVG_DEMUXER 1
22082205
%define CONFIG_ASF_DEMUXER 1
22092206
%define CONFIG_ASF_O_DEMUXER 1
22102207
%define CONFIG_ASS_DEMUXER 1
@@ -2519,6 +2516,7 @@
25192516
%define CONFIG_APTX_MUXER 1
25202517
%define CONFIG_APTX_HD_MUXER 1
25212518
%define CONFIG_ARGO_ASF_MUXER 1
2519+
%define CONFIG_ARGO_CVG_MUXER 1
25222520
%define CONFIG_ASF_MUXER 1
25232521
%define CONFIG_ASS_MUXER 1
25242522
%define CONFIG_AST_MUXER 1
@@ -2671,6 +2669,7 @@
26712669
%define CONFIG_WEBM_CHUNK_MUXER 1
26722670
%define CONFIG_WEBP_MUXER 1
26732671
%define CONFIG_WEBVTT_MUXER 1
2672+
%define CONFIG_WSAUD_MUXER 1
26742673
%define CONFIG_WTV_MUXER 1
26752674
%define CONFIG_WV_MUXER 1
26762675
%define CONFIG_YUV4MPEGPIPE_MUXER 1

‎SMP/config.h‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
#define HAVE_MIPSDSP 0
130130
#define HAVE_MIPSDSPR2 0
131131
#define HAVE_MSA 0
132-
#define HAVE_MSA2 0
133132
#define HAVE_LOONGSON2 0
134133
#define HAVE_LOONGSON3 0
135134
#define HAVE_MMI 0
@@ -175,7 +174,6 @@
175174
#define HAVE_MIPSDSP_EXTERNAL 0
176175
#define HAVE_MIPSDSPR2_EXTERNAL 0
177176
#define HAVE_MSA_EXTERNAL 0
178-
#define HAVE_MSA2_EXTERNAL 0
179177
#define HAVE_LOONGSON2_EXTERNAL 0
180178
#define HAVE_LOONGSON3_EXTERNAL 0
181179
#define HAVE_MMI_EXTERNAL 0
@@ -221,7 +219,6 @@
221219
#define HAVE_MIPSDSP_INLINE 0
222220
#define HAVE_MIPSDSPR2_INLINE 0
223221
#define HAVE_MSA_INLINE 0
224-
#define HAVE_MSA2_INLINE 0
225222
#define HAVE_LOONGSON2_INLINE 0
226223
#define HAVE_LOONGSON3_INLINE 0
227224
#define HAVE_MMI_INLINE 0
@@ -664,7 +661,6 @@
664661
#define CONFIG_AVFORMAT 1
665662
#define CONFIG_AVCODEC 1
666663
#define CONFIG_SWRESAMPLE 1
667-
#define CONFIG_AVRESAMPLE 0
668664
#define CONFIG_AVUTIL 1
669665
#define CONFIG_FFPLAY 1
670666
#define CONFIG_FFPROBE 1
@@ -1268,6 +1264,7 @@
12681264
#define CONFIG_ADPCM_G722_DECODER 1
12691265
#define CONFIG_ADPCM_G726_DECODER 1
12701266
#define CONFIG_ADPCM_G726LE_DECODER 1
1267+
#define CONFIG_ADPCM_IMA_ACORN_DECODER 1
12711268
#define CONFIG_ADPCM_IMA_AMV_DECODER 1
12721269
#define CONFIG_ADPCM_IMA_ALP_DECODER 1
12731270
#define CONFIG_ADPCM_IMA_APC_DECODER 1
@@ -1534,6 +1531,7 @@
15341531
#define CONFIG_ADPCM_IMA_QT_ENCODER 1
15351532
#define CONFIG_ADPCM_IMA_SSI_ENCODER 1
15361533
#define CONFIG_ADPCM_IMA_WAV_ENCODER 1
1534+
#define CONFIG_ADPCM_IMA_WS_ENCODER 1
15371535
#define CONFIG_ADPCM_MS_ENCODER 1
15381536
#define CONFIG_ADPCM_SWF_ENCODER 1
15391537
#define CONFIG_ADPCM_YAMAHA_ENCODER 1
@@ -1594,9 +1592,6 @@
15941592
#define CONFIG_H264_V4L2M2M_ENCODER 0
15951593
#define CONFIG_H264_VAAPI_ENCODER 0
15961594
#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
1597-
#define CONFIG_NVENC_ENCODER 1
1598-
#define CONFIG_NVENC_H264_ENCODER 1
1599-
#define CONFIG_NVENC_HEVC_ENCODER 1
16001595
#define CONFIG_HEVC_AMF_ENCODER 1
16011596
#define CONFIG_HEVC_MF_ENCODER 1
16021597
#define CONFIG_HEVC_NVENC_ENCODER 1
@@ -1918,7 +1913,6 @@
19181913
#define CONFIG_MCOMPAND_FILTER 1
19191914
#define CONFIG_PAN_FILTER 1
19201915
#define CONFIG_REPLAYGAIN_FILTER 1
1921-
#define CONFIG_RESAMPLE_FILTER 0
19221916
#define CONFIG_RUBBERBAND_FILTER 0
19231917
#define CONFIG_SIDECHAINCOMPRESS_FILTER 1
19241918
#define CONFIG_SIDECHAINGATE_FILTER 1
@@ -2016,6 +2010,7 @@
20162010
#define CONFIG_DILATION_FILTER 1
20172011
#define CONFIG_DILATION_OPENCL_FILTER 0
20182012
#define CONFIG_DISPLACE_FILTER 1
2013+
#define CONFIG_DNN_CLASSIFY_FILTER 1
20192014
#define CONFIG_DNN_DETECT_FILTER 1
20202015
#define CONFIG_DNN_PROCESSING_FILTER 1
20212016
#define CONFIG_DOUBLEWEAVE_FILTER 1
@@ -2057,6 +2052,7 @@
20572052
#define CONFIG_GRADFUN_FILTER 1
20582053
#define CONFIG_GRAPHMONITOR_FILTER 1
20592054
#define CONFIG_GREYEDGE_FILTER 1
2055+
#define CONFIG_GUIDED_FILTER 1
20602056
#define CONFIG_HALDCLUT_FILTER 1
20612057
#define CONFIG_HFLIP_FILTER 1
20622058
#define CONFIG_HISTEQ_FILTER 1
@@ -2097,7 +2093,7 @@
20972093
#define CONFIG_MASKEDMIN_FILTER 1
20982094
#define CONFIG_MASKEDTHRESHOLD_FILTER 1
20992095
#define CONFIG_MASKFUN_FILTER 1
2100-
#define CONFIG_MCDEINT_FILTER 1
2096+
#define CONFIG_MCDEINT_FILTER 0
21012097
#define CONFIG_MEDIAN_FILTER 1
21022098
#define CONFIG_MERGEPLANES_FILTER 1
21032099
#define CONFIG_MESTIMATE_FILTER 1
@@ -2228,7 +2224,7 @@
22282224
#define CONFIG_UNSHARP_FILTER 1
22292225
#define CONFIG_UNSHARP_OPENCL_FILTER 0
22302226
#define CONFIG_UNTILE_FILTER 1
2231-
#define CONFIG_USPP_FILTER 1
2227+
#define CONFIG_USPP_FILTER 0
22322228
#define CONFIG_V360_FILTER 1
22332229
#define CONFIG_VAGUEDENOISER_FILTER 1
22342230
#define CONFIG_VECTORSCOPE_FILTER 1
@@ -2328,6 +2324,7 @@
23282324
#define CONFIG_AQTITLE_DEMUXER 1
23292325
#define CONFIG_ARGO_ASF_DEMUXER 1
23302326
#define CONFIG_ARGO_BRP_DEMUXER 1
2327+
#define CONFIG_ARGO_CVG_DEMUXER 1
23312328
#define CONFIG_ASF_DEMUXER 1
23322329
#define CONFIG_ASF_O_DEMUXER 1
23332330
#define CONFIG_ASS_DEMUXER 1
@@ -2642,6 +2639,7 @@
26422639
#define CONFIG_APTX_MUXER 1
26432640
#define CONFIG_APTX_HD_MUXER 1
26442641
#define CONFIG_ARGO_ASF_MUXER 1
2642+
#define CONFIG_ARGO_CVG_MUXER 1
26452643
#define CONFIG_ASF_MUXER 1
26462644
#define CONFIG_ASS_MUXER 1
26472645
#define CONFIG_AST_MUXER 1
@@ -2794,6 +2792,7 @@
27942792
#define CONFIG_WEBM_CHUNK_MUXER 1
27952793
#define CONFIG_WEBP_MUXER 1
27962794
#define CONFIG_WEBVTT_MUXER 1
2795+
#define CONFIG_WSAUD_MUXER 1
27972796
#define CONFIG_WTV_MUXER 1
27982797
#define CONFIG_WV_MUXER 1
27992798
#define CONFIG_YUV4MPEGPIPE_MUXER 1

‎SMP/ffmpeg.vcxproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<ClCompile Include="..\fftools\ffmpeg_qsv.c" />
4242
<ClCompile Include="..\fftools\cmdutils.c" />
4343
<ClCompile Include="..\fftools\ffmpeg.c" />
44-
<ClCompile Include="ffmpeg\dce_defs.c" />
4544
</ItemGroup>
4645
<PropertyGroup Label="Globals">
4746
<ProjectGuid>{4081C77E-F1F7-49FA-9BD8-A4D267C83716}</ProjectGuid>
@@ -153,55 +152,63 @@
153152
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
154153
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
155154
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
155+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
156156
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
157157
</PropertyGroup>
158158
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
159159
<TargetName>ffmpegd</TargetName>
160160
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
161161
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
162162
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
163+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
163164
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
164165
</PropertyGroup>
165166
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
166167
<TargetName>ffmpegd</TargetName>
167168
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
168169
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
169170
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
171+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
170172
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
171173
</PropertyGroup>
172174
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
173175
<TargetName>ffmpegd</TargetName>
174176
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
175177
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
176178
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
179+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
177180
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
178181
</PropertyGroup>
179182
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
180183
<TargetName>ffmpeg</TargetName>
181184
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
182185
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
183186
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
187+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
184188
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
185189
</PropertyGroup>
186190
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
187191
<TargetName>ffmpeg</TargetName>
188192
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
189193
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
190194
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
195+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
191196
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
192197
</PropertyGroup>
193198
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
194199
<TargetName>ffmpeg</TargetName>
195200
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
196201
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
197202
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
203+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
198204
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
199205
</PropertyGroup>
200206
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
201207
<TargetName>ffmpeg</TargetName>
202208
<OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
203209
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
204210
<LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
211+
<LocalDebuggerCommand>$(TargetFileName)</LocalDebuggerCommand>
205212
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
206213
</PropertyGroup>
207214
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎SMP/ffmpeg.vcxproj.filters‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
1414
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
1515
</Filter>
16-
<Filter Include="Source Files\ffmpeg">
17-
<UniqueIdentifier>{cac6df1e-4a60-495c-8daa-5707dc1216ff}</UniqueIdentifier>
18-
</Filter>
1916
<Filter Include="Source Files\fftools">
20-
<UniqueIdentifier>{9fee14b2-1b77-463a-bd6b-60efdcf8850f}</UniqueIdentifier>
17+
<UniqueIdentifier>{cac6df1e-4a60-495c-8daa-5707dc1216ff}</UniqueIdentifier>
2118
</Filter>
2219
</ItemGroup>
2320
<ItemGroup>
@@ -39,8 +36,5 @@
3936
<ClCompile Include="..\fftools\ffmpeg.c">
4037
<Filter>Source Files\fftools</Filter>
4138
</ClCompile>
42-
<ClCompile Include="ffmpeg\dce_defs.c">
43-
<Filter>Source Files\ffmpeg</Filter>
44-
</ClCompile>
4539
</ItemGroup>
4640
</Project>

‎SMP/ffmpeg/dce_defs.c‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)