diff --git a/SMP/config.asm b/SMP/config.asm
index 6c191a5668d69df8e43177d4e6bb7c0a9831f9a2..dad292bb2b82c00dd937a303aa44dacab848fceb 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1608,6 +1608,7 @@
%define CONFIG_DCA_PARSER 1
%define CONFIG_DIRAC_PARSER 1
%define CONFIG_DNXHD_PARSER 1
+%define CONFIG_DOLBY_E_PARSER 1
%define CONFIG_DPX_PARSER 1
%define CONFIG_DVAUDIO_PARSER 1
%define CONFIG_DVBSUB_PARSER 1
@@ -1843,6 +1844,7 @@
%define CONFIG_COLORLEVELS_FILTER 1
%define CONFIG_COLORMATRIX_FILTER 1
%define CONFIG_COLORSPACE_FILTER 1
+%define CONFIG_COLORTEMPERATURE_FILTER 1
%define CONFIG_CONVOLUTION_FILTER 1
%define CONFIG_CONVOLUTION_OPENCL_FILTER 0
%define CONFIG_CONVOLVE_FILTER 1
@@ -1885,9 +1887,11 @@
%define CONFIG_EDGEDETECT_FILTER 1
%define CONFIG_ELBG_FILTER 1
%define CONFIG_ENTROPY_FILTER 1
+%define CONFIG_EPX_FILTER 1
%define CONFIG_EQ_FILTER 1
%define CONFIG_EROSION_FILTER 1
%define CONFIG_EROSION_OPENCL_FILTER 0
+%define CONFIG_ESTDIF_FILTER 1
%define CONFIG_EXTRACTPLANES_FILTER 1
%define CONFIG_FADE_FILTER 1
%define CONFIG_FFTDNOIZ_FILTER 1
@@ -1932,6 +1936,7 @@
%define CONFIG_INTERLACE_FILTER 1
%define CONFIG_INTERLEAVE_FILTER 1
%define CONFIG_KERNDEINT_FILTER 1
+%define CONFIG_KIRSCH_FILTER 1
%define CONFIG_LAGFUN_FILTER 1
%define CONFIG_LENSCORRECTION_FILTER 1
%define CONFIG_LENSFUN_FILTER 0
@@ -2033,6 +2038,7 @@
%define CONFIG_SETSAR_FILTER 1
%define CONFIG_SETTB_FILTER 1
%define CONFIG_SHARPNESS_VAAPI_FILTER 0
+%define CONFIG_SHEAR_FILTER 1
%define CONFIG_SHOWINFO_FILTER 1
%define CONFIG_SHOWPALETTE_FILTER 1
%define CONFIG_SHUFFLEFRAMES_FILTER 1
diff --git a/SMP/config.h b/SMP/config.h
index 6ec860671f81eb610ae49e88804477d08b496267..7a392d029d563efee0bca94f863d8da0d234640b 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1730,6 +1730,7 @@
#define CONFIG_DCA_PARSER 1
#define CONFIG_DIRAC_PARSER 1
#define CONFIG_DNXHD_PARSER 1
+#define CONFIG_DOLBY_E_PARSER 1
#define CONFIG_DPX_PARSER 1
#define CONFIG_DVAUDIO_PARSER 1
#define CONFIG_DVBSUB_PARSER 1
@@ -1965,6 +1966,7 @@
#define CONFIG_COLORLEVELS_FILTER 1
#define CONFIG_COLORMATRIX_FILTER 1
#define CONFIG_COLORSPACE_FILTER 1
+#define CONFIG_COLORTEMPERATURE_FILTER 1
#define CONFIG_CONVOLUTION_FILTER 1
#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
#define CONFIG_CONVOLVE_FILTER 1
@@ -2007,9 +2009,11 @@
#define CONFIG_EDGEDETECT_FILTER 1
#define CONFIG_ELBG_FILTER 1
#define CONFIG_ENTROPY_FILTER 1
+#define CONFIG_EPX_FILTER 1
#define CONFIG_EQ_FILTER 1
#define CONFIG_EROSION_FILTER 1
#define CONFIG_EROSION_OPENCL_FILTER 0
+#define CONFIG_ESTDIF_FILTER 1
#define CONFIG_EXTRACTPLANES_FILTER 1
#define CONFIG_FADE_FILTER 1
#define CONFIG_FFTDNOIZ_FILTER 1
@@ -2054,6 +2058,7 @@
#define CONFIG_INTERLACE_FILTER 1
#define CONFIG_INTERLEAVE_FILTER 1
#define CONFIG_KERNDEINT_FILTER 1
+#define CONFIG_KIRSCH_FILTER 1
#define CONFIG_LAGFUN_FILTER 1
#define CONFIG_LENSCORRECTION_FILTER 1
#define CONFIG_LENSFUN_FILTER 0
@@ -2155,6 +2160,7 @@
#define CONFIG_SETSAR_FILTER 1
#define CONFIG_SETTB_FILTER 1
#define CONFIG_SHARPNESS_VAAPI_FILTER 0
+#define CONFIG_SHEAR_FILTER 1
#define CONFIG_SHOWINFO_FILTER 1
#define CONFIG_SHOWPALETTE_FILTER 1
#define CONFIG_SHUFFLEFRAMES_FILTER 1
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index c74d9695d1ed2fde496e1aa480fbafb6c1feb0f0..3aaf147ec11e9b781b687eb0209ed3ef703100ec 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -196,8 +196,10 @@
+
+
@@ -214,7 +216,6 @@
-
@@ -243,7 +244,6 @@
-
@@ -437,6 +437,7 @@
+
@@ -486,11 +487,12 @@
-
+
+
@@ -517,12 +519,9 @@
-
-
-
+
-
@@ -536,7 +535,6 @@
-
@@ -605,7 +603,6 @@
-
@@ -626,6 +623,7 @@
+
@@ -664,6 +662,7 @@
+
@@ -930,6 +929,7 @@
+
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index 1301dcb6c59dafbdc23d8daa995f5d938ee55c62..079f1aee1120c159626f7cd91bd9d5a95d885445 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -438,12 +438,18 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -492,9 +498,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -579,9 +582,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -1161,6 +1161,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -1308,9 +1311,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -1323,6 +1323,12 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -1401,24 +1407,15 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
-
- Source Files\libavcodec
-
Source Files\libavcodec
-
+
Source Files\libavcodec
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -1458,9 +1455,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -1665,9 +1659,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -1728,6 +1719,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -1842,6 +1836,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -2640,6 +2637,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
index 9cab28a2d331a2c140f0f047b10678fb64c0a66b..bdbc937f94d34a4b2f5e16de9dfa0f943a3d83d3 100644
--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -140,7 +140,6 @@ void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx,
#if !(ARCH_X86_64)
void ff_fft15_avx(FFTComplex *out, FFTComplex *in, FFTComplex *exptab, ptrdiff_t stride) {return;}
#endif
-void ff_fft_fixed_init_arm(FFTContext *s) {return;}
void ff_fft_init_aarch64(FFTContext *s) {return;}
void ff_fft_init_arm(FFTContext *s) {return;}
void ff_fft_init_mips(FFTContext *s) {return;}
diff --git a/SMP/libavcodec/parser_list.c b/SMP/libavcodec/parser_list.c
index 095d3ed461ad7ee5301145ed177f9b46e278e978..a42b3b0aa89721993a0f1b5ed88e528f9c8a1191 100644
--- a/SMP/libavcodec/parser_list.c
+++ b/SMP/libavcodec/parser_list.c
@@ -32,6 +32,7 @@ static const AVCodecParser *parser_list[] = {
&ff_dca_parser,
&ff_dirac_parser,
&ff_dnxhd_parser,
+ &ff_dolby_e_parser,
&ff_dpx_parser,
&ff_dvaudio_parser,
&ff_dvbsub_parser,
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index b36218685396eae869a60ca11323deea95226f3f..3b5f73daa196727f686f6c8efbe5f72618758527 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -246,6 +246,7 @@
+
@@ -278,6 +279,8 @@
+
+
@@ -364,6 +367,7 @@
+
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 1faa89431f392c104bb31758373259d660811fa2..976bc243c4aabe8eea87e1ad5b8660638b7742ad 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -591,6 +591,9 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
Source Files\libavfilter
@@ -687,6 +690,12 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
+
+ Source Files\libavfilter
+
Source Files\libavfilter
@@ -945,6 +954,9 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
Source Files\libavfilter
diff --git a/SMP/libavfilter/dce_defs.c b/SMP/libavfilter/dce_defs.c
index baadec4a528133cd74d75b5da3591beb9bcb015e..6ed4ac683d2958572c708b1d200f2cafefea3236 100644
--- a/SMP/libavfilter/dce_defs.c
+++ b/SMP/libavfilter/dce_defs.c
@@ -28,13 +28,13 @@
void ff_atadenoise_filter_row8_serial_sse4(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf,
int w, int mid, int size,
- int thra, int thrb) {return;}
+ int thra, int thrb, const float *weights) {return;}
#endif
#if !(ARCH_X86_64)
void ff_atadenoise_filter_row8_sse4(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf,
int w, int mid, int size,
- int thra, int thrb) {return;}
+ int thra, int thrb, const float *weights) {return;}
#endif
#if !(ARCH_X86_64)
void ff_multiply3x3_sse2(int16_t *data[3], ptrdiff_t stride, int w, int h,
diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c
index 598c9bb1109346ac387b6660815a67e7ab0cff41..5990d90b4b07e76575c000b405a0df8046df3aa7 100644
--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -171,6 +171,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_colorlevels,
&ff_vf_colormatrix,
&ff_vf_colorspace,
+ &ff_vf_colortemperature,
&ff_vf_convolution,
&ff_vf_convolve,
&ff_vf_copy,
@@ -207,8 +208,10 @@ static const AVFilter *filter_list[] = {
&ff_vf_edgedetect,
&ff_vf_elbg,
&ff_vf_entropy,
+ &ff_vf_epx,
&ff_vf_eq,
&ff_vf_erosion,
+ &ff_vf_estdif,
&ff_vf_extractplanes,
&ff_vf_fade,
&ff_vf_fftdnoiz,
@@ -252,6 +255,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_interlace,
&ff_vf_interleave,
&ff_vf_kerndeint,
+ &ff_vf_kirsch,
&ff_vf_lagfun,
&ff_vf_lenscorrection,
&ff_vf_limiter,
@@ -335,6 +339,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_setrange,
&ff_vf_setsar,
&ff_vf_settb,
+ &ff_vf_shear,
&ff_vf_showinfo,
&ff_vf_showpalette,
&ff_vf_shuffleframes,