Skip to content

Commit d1a7dfa

Browse files
SibrasSibras
committed
project: Update for upstream merge.
1 parent a049f4c commit d1a7dfa

22 files changed

+231
-56
lines changed

‎SMP/SMP.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/fftools/opt_common.c b/fftools/opt_common.c
2-
index 7cd8b1c66e..0f7955fb15 100644
2+
index 8a06df82df..9a31622bb4 100644
33
--- a/fftools/opt_common.c
44
+++ b/fftools/opt_common.c
55
@@ -48,6 +48,9 @@
@@ -13,7 +13,7 @@ index 7cd8b1c66e..0f7955fb15 100644
1313
#include "libavdevice/version.h"
1414

1515
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
16-
index d5c241d169..6d4006726b 100644
16+
index 36a6d8482d..bcb42d47fc 100644
1717
--- a/libavcodec/mfenc.c
1818
+++ b/libavcodec/mfenc.c
1919
@@ -59,6 +59,10 @@ typedef struct MFContext {

‎SMP/config.asm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
%define HAVE_POWER8 0
7171
%define HAVE_PPC4XX 0
7272
%define HAVE_VSX 0
73+
%define HAVE_RVV 0
7374
%define HAVE_AESNI 1
7475
%define HAVE_AMD3DNOW 1
7576
%define HAVE_AMD3DNOWEXT 1
@@ -118,6 +119,7 @@
118119
%define HAVE_POWER8_EXTERNAL 0
119120
%define HAVE_PPC4XX_EXTERNAL 0
120121
%define HAVE_VSX_EXTERNAL 0
122+
%define HAVE_RVV_EXTERNAL 0
121123
%define HAVE_AESNI_EXTERNAL 1
122124
%define HAVE_AMD3DNOW_EXTERNAL 1
123125
%define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -166,6 +168,7 @@
166168
%define HAVE_POWER8_INLINE 0
167169
%define HAVE_PPC4XX_INLINE 0
168170
%define HAVE_VSX_INLINE 0
171+
%define HAVE_RVV_INLINE 0
169172
%define HAVE_AESNI_INLINE 1
170173
%define HAVE_AMD3DNOW_INLINE 1
171174
%define HAVE_AMD3DNOWEXT_INLINE 1
@@ -345,6 +348,7 @@
345348
%define HAVE_NANOSLEEP 0
346349
%define HAVE_PEEKNAMEDPIPE 1
347350
%define HAVE_POSIX_MEMALIGN 0
351+
%define HAVE_PRCTL 0
348352
%define HAVE_PTHREAD_CANCEL 0
349353
%define HAVE_SCHED_GETAFFINITY 0
350354
%define HAVE_SECITEMIMPORT 0

‎SMP/config.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
#define HAVE_POWER8 0
107107
#define HAVE_PPC4XX 0
108108
#define HAVE_VSX 0
109+
#define HAVE_RVV 0
109110
#define HAVE_AESNI 1
110111
#define HAVE_AMD3DNOW 1
111112
#define HAVE_AMD3DNOWEXT 1
@@ -154,6 +155,7 @@
154155
#define HAVE_POWER8_EXTERNAL 0
155156
#define HAVE_PPC4XX_EXTERNAL 0
156157
#define HAVE_VSX_EXTERNAL 0
158+
#define HAVE_RVV_EXTERNAL 0
157159
#define HAVE_AESNI_EXTERNAL 1
158160
#define HAVE_AMD3DNOW_EXTERNAL 1
159161
#define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -202,6 +204,7 @@
202204
#define HAVE_POWER8_INLINE 0
203205
#define HAVE_PPC4XX_INLINE 0
204206
#define HAVE_VSX_INLINE 0
207+
#define HAVE_RVV_INLINE 0
205208
#define HAVE_AESNI_INLINE ARCH_X86 && HAVE_INLINE_ASM
206209
#define HAVE_AMD3DNOW_INLINE ARCH_X86 && HAVE_INLINE_ASM
207210
#define HAVE_AMD3DNOWEXT_INLINE ARCH_X86 && HAVE_INLINE_ASM
@@ -409,6 +412,7 @@
409412
#define HAVE_NANOSLEEP 0
410413
#define HAVE_PEEKNAMEDPIPE 1
411414
#define HAVE_POSIX_MEMALIGN 0
415+
#define HAVE_PRCTL 0
412416
#define HAVE_PTHREAD_CANCEL 0
413417
#define HAVE_SCHED_GETAFFINITY 0
414418
#define HAVE_SECITEMIMPORT 0

‎SMP/config_components.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#define CONFIG_CHOMP_BSF 1
3030
#define CONFIG_DUMP_EXTRADATA_BSF 1
3131
#define CONFIG_DCA_CORE_BSF 1
32+
#define CONFIG_DTS2PTS_BSF 1
3233
#define CONFIG_DV_ERROR_MARKER_BSF 1
3334
#define CONFIG_EAC3_CORE_BSF 1
3435
#define CONFIG_EXTRACT_EXTRADATA_BSF 1
@@ -191,6 +192,7 @@
191192
#define CONFIG_M101_DECODER 1
192193
#define CONFIG_MAGICYUV_DECODER 1
193194
#define CONFIG_MDEC_DECODER 1
195+
#define CONFIG_MEDIA100_DECODER 1
194196
#define CONFIG_MIMIC_DECODER 1
195197
#define CONFIG_MJPEG_DECODER 1
196198
#define CONFIG_MJPEGB_DECODER 1
@@ -341,6 +343,7 @@
341343
#define CONFIG_VP9_RKMPP_DECODER 0
342344
#define CONFIG_VP9_V4L2M2M_DECODER 0
343345
#define CONFIG_VQA_DECODER 1
346+
#define CONFIG_VQC_DECODER 1
344347
#define CONFIG_WBMP_DECODER 1
345348
#define CONFIG_WEBP_DECODER 1
346349
#define CONFIG_WCMV_DECODER 1
@@ -376,6 +379,7 @@
376379
#define CONFIG_ALS_DECODER 1
377380
#define CONFIG_AMRNB_DECODER 1
378381
#define CONFIG_AMRWB_DECODER 1
382+
#define CONFIG_APAC_DECODER 1
379383
#define CONFIG_APE_DECODER 1
380384
#define CONFIG_APTX_DECODER 1
381385
#define CONFIG_APTX_HD_DECODER 1
@@ -388,6 +392,7 @@
388392
#define CONFIG_BINKAUDIO_DCT_DECODER 1
389393
#define CONFIG_BINKAUDIO_RDFT_DECODER 1
390394
#define CONFIG_BMV_AUDIO_DECODER 1
395+
#define CONFIG_BONK_DECODER 1
391396
#define CONFIG_COOK_DECODER 1
392397
#define CONFIG_DCA_DECODER 1
393398
#define CONFIG_DFPWM_DECODER 1
@@ -404,6 +409,7 @@
404409
#define CONFIG_FASTAUDIO_DECODER 1
405410
#define CONFIG_FFWAVESYNTH_DECODER 1
406411
#define CONFIG_FLAC_DECODER 1
412+
#define CONFIG_FTR_DECODER 1
407413
#define CONFIG_G723_1_DECODER 1
408414
#define CONFIG_G729_DECODER 1
409415
#define CONFIG_GSM_DECODER 1
@@ -418,6 +424,7 @@
418424
#define CONFIG_MACE3_DECODER 1
419425
#define CONFIG_MACE6_DECODER 1
420426
#define CONFIG_METASOUND_DECODER 1
427+
#define CONFIG_MISC4_DECODER 1
421428
#define CONFIG_MLP_DECODER 1
422429
#define CONFIG_MP1_DECODER 1
423430
#define CONFIG_MP1FLOAT_DECODER 1
@@ -909,6 +916,8 @@
909916
#define CONFIG_AAC_MF_ENCODER 1
910917
#define CONFIG_AC3_MF_ENCODER 1
911918
#define CONFIG_H263_V4L2M2M_ENCODER 0
919+
#define CONFIG_AV1_NVENC_ENCODER 0
920+
#define CONFIG_AV1_QSV_ENCODER 0
912921
#define CONFIG_LIBOPENH264_ENCODER 0
913922
#if CONFIG_AMF
914923
# define CONFIG_H264_AMF_ENCODER 1
@@ -1184,6 +1193,7 @@
11841193
#define CONFIG_DVDSUB_PARSER 1
11851194
#define CONFIG_DVD_NAV_PARSER 1
11861195
#define CONFIG_FLAC_PARSER 1
1196+
#define CONFIG_FTR_PARSER 1
11871197
#define CONFIG_G723_1_PARSER 1
11881198
#define CONFIG_G729_PARSER 1
11891199
#define CONFIG_GIF_PARSER 1
@@ -1195,6 +1205,7 @@
11951205
#define CONFIG_HDR_PARSER 1
11961206
#define CONFIG_IPU_PARSER 1
11971207
#define CONFIG_JPEG2000_PARSER 1
1208+
#define CONFIG_MISC4_PARSER 1
11981209
#define CONFIG_MJPEG_PARSER 1
11991210
#define CONFIG_MLP_PARSER 1
12001211
#define CONFIG_MPEG4VIDEO_PARSER 1
@@ -1217,6 +1228,7 @@
12171228
#define CONFIG_WEBP_PARSER 1
12181229
#define CONFIG_XBM_PARSER 1
12191230
#define CONFIG_XMA_PARSER 1
1231+
#define CONFIG_XWD_PARSER 1
12201232
#define CONFIG_ALSA_INDEV 0
12211233
#define CONFIG_ANDROID_CAMERA_INDEV 0
12221234
#define CONFIG_AVFOUNDATION_INDEV 0
@@ -1419,9 +1431,11 @@
14191431
#define CONFIG_AVGBLUR_FILTER 1
14201432
#define CONFIG_AVGBLUR_OPENCL_FILTER 0
14211433
#define CONFIG_AVGBLUR_VULKAN_FILTER 0
1434+
#define CONFIG_BACKGROUNDKEY_FILTER 1
14221435
#define CONFIG_BBOX_FILTER 1
14231436
#define CONFIG_BENCH_FILTER 1
14241437
#define CONFIG_BILATERAL_FILTER 1
1438+
#define CONFIG_BILATERAL_CUDA_FILTER 0
14251439
#define CONFIG_BITPLANENOISE_FILTER 1
14261440
#define CONFIG_BLACKDETECT_FILTER 1
14271441
#define CONFIG_BLACKFRAME_FILTER 1
@@ -1454,6 +1468,7 @@
14541468
#define CONFIG_COLORMAP_FILTER 1
14551469
#define CONFIG_COLORMATRIX_FILTER 1
14561470
#define CONFIG_COLORSPACE_FILTER 1
1471+
#define CONFIG_COLORSPACE_CUDA_FILTER 0
14571472
#define CONFIG_COLORTEMPERATURE_FILTER 1
14581473
#define CONFIG_CONVOLUTION_FILTER 1
14591474
#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
@@ -1808,6 +1823,7 @@
18081823
#define CONFIG_TESTSRC2_FILTER 1
18091824
#define CONFIG_YUVTESTSRC_FILTER 1
18101825
#define CONFIG_NULLSINK_FILTER 1
1826+
#define CONFIG_A3DSCOPE_FILTER 1
18111827
#define CONFIG_ABITSCOPE_FILTER 1
18121828
#define CONFIG_ADRAWGRAPH_FILTER 1
18131829
#define CONFIG_AGRAPHMONITOR_FILTER 1
@@ -1849,6 +1865,7 @@
18491865
#define CONFIG_AMRNB_DEMUXER 1
18501866
#define CONFIG_AMRWB_DEMUXER 1
18511867
#define CONFIG_ANM_DEMUXER 1
1868+
#define CONFIG_APAC_DEMUXER 1
18521869
#define CONFIG_APC_DEMUXER 1
18531870
#define CONFIG_APE_DEMUXER 1
18541871
#define CONFIG_APM_DEMUXER 1
@@ -1882,6 +1899,7 @@
18821899
#define CONFIG_BFSTM_DEMUXER 1
18831900
#define CONFIG_BRSTM_DEMUXER 1
18841901
#define CONFIG_BOA_DEMUXER 1
1902+
#define CONFIG_BONK_DEMUXER 1
18851903
#define CONFIG_C93_DEMUXER 1
18861904
#define CONFIG_CAF_DEMUXER 1
18871905
#define CONFIG_CAVSVIDEO_DEMUXER 1
@@ -1966,6 +1984,7 @@
19661984
#define CONFIG_JV_DEMUXER 1
19671985
#define CONFIG_KUX_DEMUXER 1
19681986
#define CONFIG_KVAG_DEMUXER 1
1987+
#define CONFIG_LAF_DEMUXER 1
19691988
#define CONFIG_LMLM4_DEMUXER 1
19701989
#define CONFIG_LOAS_DEMUXER 1
19711990
#define CONFIG_LUODAT_DEMUXER 1

‎SMP/ffmpeg.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<ClCompile Include="..\fftools\ffmpeg_filter.c" />
4848
<ClCompile Include="..\fftools\ffmpeg_hw.c" />
4949
<ClCompile Include="..\fftools\ffmpeg_mux.c" />
50+
<ClCompile Include="..\fftools\ffmpeg_mux_init.c" />
5051
<ClCompile Include="..\fftools\ffmpeg_opt.c" />
5152
<ClCompile Include="..\fftools\objpool.c" />
5253
<ClCompile Include="..\fftools\sync_queue.c" />

‎SMP/ffmpeg.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
<ClCompile Include="..\fftools\ffmpeg_mux.c">
3939
<Filter>Source Files\fftools</Filter>
4040
</ClCompile>
41+
<ClCompile Include="..\fftools\ffmpeg_mux_init.c">
42+
<Filter>Source Files\fftools</Filter>
43+
</ClCompile>
4144
<ClCompile Include="..\fftools\ffmpeg_opt.c">
4245
<Filter>Source Files\fftools</Filter>
4346
</ClCompile>

0 commit comments

Comments
 (0)