Skip to content

Commit f919964

Browse files
SibrasSibras
committed
projects: Update for upstream merge.
1 parent 04d0757 commit f919964

File tree

7 files changed

+37
-1
lines changed

7 files changed

+37
-1
lines changed

‎SMP/config.asm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
%define HAVE_ES2_GL_H 0
239239
%define HAVE_GSM_H 0
240240
%define HAVE_IO_H 1
241+
%define HAVE_LINUX_DMA_BUF_H 0
241242
%define HAVE_LINUX_PERF_EVENT_H 0
242243
%define HAVE_MACHINE_IOCTL_BT848_H 0
243244
%define HAVE_MACHINE_IOCTL_METEOR_H 0
@@ -2035,6 +2036,7 @@
20352036
%define CONFIG_SHOWINFO_FILTER 1
20362037
%define CONFIG_SHOWPALETTE_FILTER 1
20372038
%define CONFIG_SHUFFLEFRAMES_FILTER 1
2039+
%define CONFIG_SHUFFLEPIXELS_FILTER 1
20382040
%define CONFIG_SHUFFLEPLANES_FILTER 1
20392041
%define CONFIG_SIDEDATA_FILTER 1
20402042
%define CONFIG_SIGNALSTATS_FILTER 1
@@ -2062,6 +2064,7 @@
20622064
%define CONFIG_TINTERLACE_FILTER 1
20632065
%define CONFIG_TLUT2_FILTER 1
20642066
%define CONFIG_TMEDIAN_FILTER 1
2067+
%define CONFIG_TMIDEQUALIZER_FILTER 1
20652068
%define CONFIG_TMIX_FILTER 1
20662069
%define CONFIG_TONEMAP_FILTER 1
20672070
%define CONFIG_TONEMAP_OPENCL_FILTER 0

‎SMP/config.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#endif
2828
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
2929
#define FFMPEG_LICENSE "GPL version 3 or later"
30-
#define CONFIG_THIS_YEAR 2020
30+
#define CONFIG_THIS_YEAR 2021
3131
#define FFMPEG_DATADIR "."
3232
#define AVCONV_DATADIR "."
3333
#if defined(__INTEL_COMPILER)
@@ -280,6 +280,7 @@
280280
#define HAVE_ES2_GL_H 0
281281
#define HAVE_GSM_H 0
282282
#define HAVE_IO_H 1
283+
#define HAVE_LINUX_DMA_BUF_H 0
283284
#define HAVE_LINUX_PERF_EVENT_H 0
284285
#define HAVE_MACHINE_IOCTL_BT848_H 0
285286
#define HAVE_MACHINE_IOCTL_METEOR_H 0
@@ -2157,6 +2158,7 @@
21572158
#define CONFIG_SHOWINFO_FILTER 1
21582159
#define CONFIG_SHOWPALETTE_FILTER 1
21592160
#define CONFIG_SHUFFLEFRAMES_FILTER 1
2161+
#define CONFIG_SHUFFLEPIXELS_FILTER 1
21602162
#define CONFIG_SHUFFLEPLANES_FILTER 1
21612163
#define CONFIG_SIDEDATA_FILTER 1
21622164
#define CONFIG_SIGNALSTATS_FILTER 1
@@ -2184,6 +2186,7 @@
21842186
#define CONFIG_TINTERLACE_FILTER 1
21852187
#define CONFIG_TLUT2_FILTER 1
21862188
#define CONFIG_TMEDIAN_FILTER 1
2189+
#define CONFIG_TMIDEQUALIZER_FILTER 1
21872190
#define CONFIG_TMIX_FILTER 1
21882191
#define CONFIG_TONEMAP_FILTER 1
21892192
#define CONFIG_TONEMAP_OPENCL_FILTER 0

‎SMP/libavcodec.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@
290290
<ClCompile Include="..\libavcodec\aacdec.c" />
291291
<ClCompile Include="..\libavcodec\aactab.c" />
292292
<ClCompile Include="..\libavcodec\aacsbr.c" />
293+
<ClCompile Include="..\libavcodec\aacps_common.c" />
293294
<ClCompile Include="..\libavcodec\aacps_float.c" />
294295
<ClCompile Include="..\libavcodec\kbdwin.c" />
295296
<ClCompile Include="..\libavcodec\aacpsdsp_float.c" />
@@ -826,6 +827,7 @@
826827
<ClCompile Include="..\libavcodec\qsvenc_vp9.c" />
827828
<ClCompile Include="..\libavcodec\vqavideo.c" />
828829
<ClCompile Include="..\libavcodec\wavpack.c" />
830+
<ClCompile Include="..\libavcodec\wavpackdata.c" />
829831
<ClCompile Include="..\libavcodec\wavpackenc.c" />
830832
<ClCompile Include="..\libavcodec\wcmv.c" />
831833
<ClCompile Include="..\libavcodec\webp.c" />

‎SMP/libavcodec.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,9 @@
720720
<ClCompile Include="..\libavcodec\aacsbr.c">
721721
<Filter>Source Files\libavcodec</Filter>
722722
</ClCompile>
723+
<ClCompile Include="..\libavcodec\aacps_common.c">
724+
<Filter>Source Files\libavcodec</Filter>
725+
</ClCompile>
723726
<ClCompile Include="..\libavcodec\aacps_float.c">
724727
<Filter>Source Files\libavcodec</Filter>
725728
</ClCompile>
@@ -2328,6 +2331,9 @@
23282331
<ClCompile Include="..\libavcodec\wavpack.c">
23292332
<Filter>Source Files\libavcodec</Filter>
23302333
</ClCompile>
2334+
<ClCompile Include="..\libavcodec\wavpackdata.c">
2335+
<Filter>Source Files\libavcodec</Filter>
2336+
</ClCompile>
23312337
<ClCompile Include="..\libavcodec\wavpackenc.c">
23322338
<Filter>Source Files\libavcodec</Filter>
23332339
</ClCompile>

‎SMP/libavfilter.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
<ClCompile Include="..\libavfilter\vf_chromashift.c" />
239239
<ClCompile Include="..\libavfilter\vf_ciescope.c" />
240240
<ClCompile Include="..\libavfilter\vf_codecview.c" />
241+
<ClCompile Include="..\libavfilter\qp_table.c" />
241242
<ClCompile Include="..\libavfilter\vf_colorbalance.c" />
242243
<ClCompile Include="..\libavfilter\vf_colorchannelmixer.c" />
243244
<ClCompile Include="..\libavfilter\vf_colorkey.c" />
@@ -366,6 +367,7 @@
366367
<ClCompile Include="..\libavfilter\vf_showinfo.c" />
367368
<ClCompile Include="..\libavfilter\vf_showpalette.c" />
368369
<ClCompile Include="..\libavfilter\vf_shuffleframes.c" />
370+
<ClCompile Include="..\libavfilter\vf_shufflepixels.c" />
369371
<ClCompile Include="..\libavfilter\vf_shuffleplanes.c" />
370372
<ClCompile Include="..\libavfilter\vf_signalstats.c" />
371373
<ClCompile Include="..\libavfilter\vf_signature.c" />
@@ -379,6 +381,7 @@
379381
<ClCompile Include="..\libavfilter\vf_thumbnail.c" />
380382
<ClCompile Include="..\libavfilter\vf_tile.c" />
381383
<ClCompile Include="..\libavfilter\vf_xmedian.c" />
384+
<ClCompile Include="..\libavfilter\vf_tmidequalizer.c" />
382385
<ClCompile Include="..\libavfilter\vf_tonemap.c" />
383386
<ClCompile Include="..\libavfilter\vf_tpad.c" />
384387
<ClCompile Include="..\libavfilter\vf_unsharp.c" />
@@ -419,6 +422,8 @@
419422
<ClCompile Include="..\libavfilter\src_movie.c" />
420423
<ClCompile Include="..\libavfilter\dnn\dnn_interface.c" />
421424
<ClCompile Include="..\libavfilter\dnn\dnn_io_proc.c" />
425+
<ClCompile Include="..\libavfilter\dnn\queue.c" />
426+
<ClCompile Include="..\libavfilter\dnn\safe_queue.c" />
422427
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c" />
423428
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layers.c" />
424429
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_avgpool.c" />

‎SMP/libavfilter.vcxproj.filters‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,9 @@
567567
<ClCompile Include="..\libavfilter\vf_codecview.c">
568568
<Filter>Source Files\libavfilter</Filter>
569569
</ClCompile>
570+
<ClCompile Include="..\libavfilter\qp_table.c">
571+
<Filter>Source Files\libavfilter</Filter>
572+
</ClCompile>
570573
<ClCompile Include="..\libavfilter\vf_colorbalance.c">
571574
<Filter>Source Files\libavfilter</Filter>
572575
</ClCompile>
@@ -951,6 +954,9 @@
951954
<ClCompile Include="..\libavfilter\vf_shuffleframes.c">
952955
<Filter>Source Files\libavfilter</Filter>
953956
</ClCompile>
957+
<ClCompile Include="..\libavfilter\vf_shufflepixels.c">
958+
<Filter>Source Files\libavfilter</Filter>
959+
</ClCompile>
954960
<ClCompile Include="..\libavfilter\vf_shuffleplanes.c">
955961
<Filter>Source Files\libavfilter</Filter>
956962
</ClCompile>
@@ -990,6 +996,9 @@
990996
<ClCompile Include="..\libavfilter\vf_xmedian.c">
991997
<Filter>Source Files\libavfilter</Filter>
992998
</ClCompile>
999+
<ClCompile Include="..\libavfilter\vf_tmidequalizer.c">
1000+
<Filter>Source Files\libavfilter</Filter>
1001+
</ClCompile>
9931002
<ClCompile Include="..\libavfilter\vf_tonemap.c">
9941003
<Filter>Source Files\libavfilter</Filter>
9951004
</ClCompile>
@@ -1110,6 +1119,12 @@
11101119
<ClCompile Include="..\libavfilter\dnn\dnn_io_proc.c">
11111120
<Filter>Source Files\libavfilter\dnn</Filter>
11121121
</ClCompile>
1122+
<ClCompile Include="..\libavfilter\dnn\queue.c">
1123+
<Filter>Source Files\libavfilter\dnn</Filter>
1124+
</ClCompile>
1125+
<ClCompile Include="..\libavfilter\dnn\safe_queue.c">
1126+
<Filter>Source Files\libavfilter\dnn</Filter>
1127+
</ClCompile>
11131128
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c">
11141129
<Filter>Source Files\libavfilter\dnn</Filter>
11151130
</ClCompile>

‎SMP/libavfilter/filter_list.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ static const AVFilter *filter_list[] = {
338338
&ff_vf_showinfo,
339339
&ff_vf_showpalette,
340340
&ff_vf_shuffleframes,
341+
&ff_vf_shufflepixels,
341342
&ff_vf_shuffleplanes,
342343
&ff_vf_sidedata,
343344
&ff_vf_signalstats,
@@ -363,6 +364,7 @@ static const AVFilter *filter_list[] = {
363364
&ff_vf_tinterlace,
364365
&ff_vf_tlut2,
365366
&ff_vf_tmedian,
367+
&ff_vf_tmidequalizer,
366368
&ff_vf_tmix,
367369
&ff_vf_tonemap,
368370
&ff_vf_tpad,

0 commit comments

Comments
 (0)