diff --git a/SMP/config.asm b/SMP/config.asm index 0e57aadd21871afeb0605c85d8eec8a7055db55d..6c191a5668d69df8e43177d4e6bb7c0a9831f9a2 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -238,6 +238,7 @@ %define HAVE_ES2_GL_H 0 %define HAVE_GSM_H 0 %define HAVE_IO_H 1 +%define HAVE_LINUX_DMA_BUF_H 0 %define HAVE_LINUX_PERF_EVENT_H 0 %define HAVE_MACHINE_IOCTL_BT848_H 0 %define HAVE_MACHINE_IOCTL_METEOR_H 0 @@ -2035,6 +2036,7 @@ %define CONFIG_SHOWINFO_FILTER 1 %define CONFIG_SHOWPALETTE_FILTER 1 %define CONFIG_SHUFFLEFRAMES_FILTER 1 +%define CONFIG_SHUFFLEPIXELS_FILTER 1 %define CONFIG_SHUFFLEPLANES_FILTER 1 %define CONFIG_SIDEDATA_FILTER 1 %define CONFIG_SIGNALSTATS_FILTER 1 @@ -2062,6 +2064,7 @@ %define CONFIG_TINTERLACE_FILTER 1 %define CONFIG_TLUT2_FILTER 1 %define CONFIG_TMEDIAN_FILTER 1 +%define CONFIG_TMIDEQUALIZER_FILTER 1 %define CONFIG_TMIX_FILTER 1 %define CONFIG_TONEMAP_FILTER 1 %define CONFIG_TONEMAP_OPENCL_FILTER 0 diff --git a/SMP/config.h b/SMP/config.h index bd85bb112eb670b0391354b683a09a74b28fb7e8..6ec860671f81eb610ae49e88804477d08b496267 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -27,7 +27,7 @@ #endif #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" #define FFMPEG_LICENSE "GPL version 3 or later" -#define CONFIG_THIS_YEAR 2020 +#define CONFIG_THIS_YEAR 2021 #define FFMPEG_DATADIR "." #define AVCONV_DATADIR "." #if defined(__INTEL_COMPILER) @@ -280,6 +280,7 @@ #define HAVE_ES2_GL_H 0 #define HAVE_GSM_H 0 #define HAVE_IO_H 1 +#define HAVE_LINUX_DMA_BUF_H 0 #define HAVE_LINUX_PERF_EVENT_H 0 #define HAVE_MACHINE_IOCTL_BT848_H 0 #define HAVE_MACHINE_IOCTL_METEOR_H 0 @@ -2157,6 +2158,7 @@ #define CONFIG_SHOWINFO_FILTER 1 #define CONFIG_SHOWPALETTE_FILTER 1 #define CONFIG_SHUFFLEFRAMES_FILTER 1 +#define CONFIG_SHUFFLEPIXELS_FILTER 1 #define CONFIG_SHUFFLEPLANES_FILTER 1 #define CONFIG_SIDEDATA_FILTER 1 #define CONFIG_SIGNALSTATS_FILTER 1 @@ -2184,6 +2186,7 @@ #define CONFIG_TINTERLACE_FILTER 1 #define CONFIG_TLUT2_FILTER 1 #define CONFIG_TMEDIAN_FILTER 1 +#define CONFIG_TMIDEQUALIZER_FILTER 1 #define CONFIG_TMIX_FILTER 1 #define CONFIG_TONEMAP_FILTER 1 #define CONFIG_TONEMAP_OPENCL_FILTER 0 diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj index fe1ace26e0bd8f2896837feafe7f17b2a2f62559..c74d9695d1ed2fde496e1aa480fbafb6c1feb0f0 100644 --- a/SMP/libavcodec.vcxproj +++ b/SMP/libavcodec.vcxproj @@ -290,6 +290,7 @@ + @@ -826,6 +827,7 @@ + diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters index 9902e02cca97b84f3bc19b2c36659e1fd1b85b92..1301dcb6c59dafbdc23d8daa995f5d938ee55c62 100644 --- a/SMP/libavcodec.vcxproj.filters +++ b/SMP/libavcodec.vcxproj.filters @@ -720,6 +720,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2328,6 +2331,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index ad22695ad75ef9e8658c933a31feaa3ab4e45678..b36218685396eae869a60ca11323deea95226f3f 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -238,6 +238,7 @@ + @@ -366,6 +367,7 @@ + @@ -379,6 +381,7 @@ + @@ -419,6 +422,8 @@ + + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index 93c224e27acb56d7ff1aa2a538b20175a8a0c22f..1faa89431f392c104bb31758373259d660811fa2 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -567,6 +567,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -951,6 +954,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -990,6 +996,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -1110,6 +1119,12 @@ Source Files\libavfilter\dnn + + Source Files\libavfilter\dnn + + + Source Files\libavfilter\dnn + Source Files\libavfilter\dnn diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c index 197c055854d8989c838cac0e1ce81ecd0310b24e..598c9bb1109346ac387b6660815a67e7ab0cff41 100644 --- a/SMP/libavfilter/filter_list.c +++ b/SMP/libavfilter/filter_list.c @@ -338,6 +338,7 @@ static const AVFilter *filter_list[] = { &ff_vf_showinfo, &ff_vf_showpalette, &ff_vf_shuffleframes, + &ff_vf_shufflepixels, &ff_vf_shuffleplanes, &ff_vf_sidedata, &ff_vf_signalstats, @@ -363,6 +364,7 @@ static const AVFilter *filter_list[] = { &ff_vf_tinterlace, &ff_vf_tlut2, &ff_vf_tmedian, + &ff_vf_tmidequalizer, &ff_vf_tmix, &ff_vf_tonemap, &ff_vf_tpad,