diff --git a/SMP/config.asm b/SMP/config.asm
index dad292bb2b82c00dd937a303aa44dacab848fceb..724be594c7bd0a9e77eea766dfd17837efe0ec8b 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -750,6 +750,7 @@
%define CONFIG_PCM_RECHUNK_BSF 1
%define CONFIG_PRORES_METADATA_BSF 1
%define CONFIG_REMOVE_EXTRADATA_BSF 1
+%define CONFIG_SETTS_BSF 1
%define CONFIG_TEXT2MOVSUB_BSF 1
%define CONFIG_TRACE_HEADERS_BSF 1
%define CONFIG_TRUEHD_CORE_BSF 1
@@ -958,6 +959,7 @@
%define CONFIG_SGI_DECODER 1
%define CONFIG_SGIRLE_DECODER 1
%define CONFIG_SHEERVIDEO_DECODER 1
+%define CONFIG_SIMBIOSIS_IMX_DECODER 1
%define CONFIG_SMACKER_DECODER 1
%define CONFIG_SMC_DECODER 1
%define CONFIG_SMVJPEG_DECODER 1
@@ -1323,6 +1325,7 @@
%define CONFIG_DNXHD_ENCODER 1
%define CONFIG_DPX_ENCODER 1
%define CONFIG_DVVIDEO_ENCODER 1
+%define CONFIG_EXR_ENCODER 1
%define CONFIG_FFV1_ENCODER 1
%define CONFIG_FFVHUFF_ENCODER 1
%define CONFIG_FITS_ENCODER 1
@@ -1349,6 +1352,7 @@
%define CONFIG_PAM_ENCODER 1
%define CONFIG_PBM_ENCODER 1
%define CONFIG_PCX_ENCODER 1
+%define CONFIG_PFM_ENCODER 1
%define CONFIG_PGM_ENCODER 1
%define CONFIG_PGMYUV_ENCODER 1
%define CONFIG_PNG_ENCODER 1
@@ -1605,6 +1609,7 @@
%define CONFIG_BMP_PARSER 1
%define CONFIG_CAVSVIDEO_PARSER 1
%define CONFIG_COOK_PARSER 1
+%define CONFIG_CRI_PARSER 1
%define CONFIG_DCA_PARSER 1
%define CONFIG_DIRAC_PARSER 1
%define CONFIG_DNXHD_PARSER 1
@@ -1644,6 +1649,7 @@
%define CONFIG_VP8_PARSER 1
%define CONFIG_VP9_PARSER 1
%define CONFIG_WEBP_PARSER 1
+%define CONFIG_XBM_PARSER 1
%define CONFIG_XMA_PARSER 1
%define CONFIG_ALSA_INDEV 0
%define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -1694,6 +1700,7 @@
%define CONFIG_AECHO_FILTER 1
%define CONFIG_AEMPHASIS_FILTER 1
%define CONFIG_AEVAL_FILTER 1
+%define CONFIG_AEXCITER_FILTER 1
%define CONFIG_AFADE_FILTER 1
%define CONFIG_AFFTDN_FILTER 1
%define CONFIG_AFFTFILT_FILTER 1
@@ -1838,6 +1845,9 @@
%define CONFIG_CODECVIEW_FILTER 1
%define CONFIG_COLORBALANCE_FILTER 1
%define CONFIG_COLORCHANNELMIXER_FILTER 1
+%define CONFIG_COLORCONTRAST_FILTER 1
+%define CONFIG_COLORCORRECT_FILTER 1
+%define CONFIG_COLORIZE_FILTER 1
%define CONFIG_COLORKEY_FILTER 1
%define CONFIG_COLORKEY_OPENCL_FILTER 0
%define CONFIG_COLORHOLD_FILTER 1
@@ -1892,6 +1902,7 @@
%define CONFIG_EROSION_FILTER 1
%define CONFIG_EROSION_OPENCL_FILTER 0
%define CONFIG_ESTDIF_FILTER 1
+%define CONFIG_EXPOSURE_FILTER 1
%define CONFIG_EXTRACTPLANES_FILTER 1
%define CONFIG_FADE_FILTER 1
%define CONFIG_FFTDNOIZ_FILTER 1
@@ -1964,6 +1975,7 @@
%define CONFIG_MIDEQUALIZER_FILTER 1
%define CONFIG_MINTERPOLATE_FILTER 1
%define CONFIG_MIX_FILTER 1
+%define CONFIG_MONOCHROME_FILTER 1
%define CONFIG_MPDECIMATE_FILTER 1
%define CONFIG_NEGATE_FILTER 1
%define CONFIG_NLMEANS_FILTER 1
@@ -2094,6 +2106,7 @@
%define CONFIG_VIBRANCE_FILTER 1
%define CONFIG_VIDSTABDETECT_FILTER 0
%define CONFIG_VIDSTABTRANSFORM_FILTER 0
+%define CONFIG_VIF_FILTER 1
%define CONFIG_VIGNETTE_FILTER 1
%define CONFIG_VMAFMOTION_FILTER 1
%define CONFIG_VPP_QSV_FILTER 1
@@ -2200,6 +2213,7 @@
%define CONFIG_BFI_DEMUXER 1
%define CONFIG_BINTEXT_DEMUXER 1
%define CONFIG_BINK_DEMUXER 1
+%define CONFIG_BINKA_DEMUXER 1
%define CONFIG_BIT_DEMUXER 1
%define CONFIG_BMV_DEMUXER 1
%define CONFIG_BFSTM_DEMUXER 1
@@ -2391,6 +2405,7 @@
%define CONFIG_SER_DEMUXER 1
%define CONFIG_SHORTEN_DEMUXER 1
%define CONFIG_SIFF_DEMUXER 1
+%define CONFIG_SIMBIOSIS_IMX_DEMUXER 1
%define CONFIG_SLN_DEMUXER 1
%define CONFIG_SMACKER_DEMUXER 1
%define CONFIG_SMJPEG_DEMUXER 1
@@ -2475,6 +2490,7 @@
%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_XBM_PIPE_DEMUXER 1
%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
%define CONFIG_IMAGE_XWD_PIPE_DEMUXER 1
%define CONFIG_LIBGME_DEMUXER 1
diff --git a/SMP/config.h b/SMP/config.h
index 7a392d029d563efee0bca94f863d8da0d234640b..d2267888d672152bc95eb6ef17d65df9f84a39e7 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -35,6 +35,7 @@
#else
# define CC_IDENT "msvc"
#endif
+#define OS_NAME Windows
#define av_restrict __restrict
#if defined(__x86_64) || defined(_M_X64)
# define EXTERN_PREFIX ""
@@ -820,6 +821,7 @@
#define CONFIG_PCM_RECHUNK_BSF 1
#define CONFIG_PRORES_METADATA_BSF 1
#define CONFIG_REMOVE_EXTRADATA_BSF 1
+#define CONFIG_SETTS_BSF 1
#define CONFIG_TEXT2MOVSUB_BSF 1
#define CONFIG_TRACE_HEADERS_BSF 1
#define CONFIG_TRUEHD_CORE_BSF 1
@@ -1028,6 +1030,7 @@
#define CONFIG_SGI_DECODER 1
#define CONFIG_SGIRLE_DECODER 1
#define CONFIG_SHEERVIDEO_DECODER 1
+#define CONFIG_SIMBIOSIS_IMX_DECODER 1
#define CONFIG_SMACKER_DECODER 1
#define CONFIG_SMC_DECODER 1
#define CONFIG_SMVJPEG_DECODER 1
@@ -1393,6 +1396,7 @@
#define CONFIG_DNXHD_ENCODER 1
#define CONFIG_DPX_ENCODER 1
#define CONFIG_DVVIDEO_ENCODER 1
+#define CONFIG_EXR_ENCODER 1
#define CONFIG_FFV1_ENCODER 1
#define CONFIG_FFVHUFF_ENCODER 1
#define CONFIG_FITS_ENCODER 1
@@ -1419,6 +1423,7 @@
#define CONFIG_PAM_ENCODER 1
#define CONFIG_PBM_ENCODER 1
#define CONFIG_PCX_ENCODER 1
+#define CONFIG_PFM_ENCODER 1
#define CONFIG_PGM_ENCODER 1
#define CONFIG_PGMYUV_ENCODER 1
#define CONFIG_PNG_ENCODER 1
@@ -1727,6 +1732,7 @@
#define CONFIG_BMP_PARSER 1
#define CONFIG_CAVSVIDEO_PARSER 1
#define CONFIG_COOK_PARSER 1
+#define CONFIG_CRI_PARSER 1
#define CONFIG_DCA_PARSER 1
#define CONFIG_DIRAC_PARSER 1
#define CONFIG_DNXHD_PARSER 1
@@ -1766,6 +1772,7 @@
#define CONFIG_VP8_PARSER 1
#define CONFIG_VP9_PARSER 1
#define CONFIG_WEBP_PARSER 1
+#define CONFIG_XBM_PARSER 1
#define CONFIG_XMA_PARSER 1
#define CONFIG_ALSA_INDEV 0
#define CONFIG_ANDROID_CAMERA_INDEV 0
@@ -1816,6 +1823,7 @@
#define CONFIG_AECHO_FILTER 1
#define CONFIG_AEMPHASIS_FILTER 1
#define CONFIG_AEVAL_FILTER 1
+#define CONFIG_AEXCITER_FILTER 1
#define CONFIG_AFADE_FILTER 1
#define CONFIG_AFFTDN_FILTER 1
#define CONFIG_AFFTFILT_FILTER 1
@@ -1960,6 +1968,9 @@
#define CONFIG_CODECVIEW_FILTER 1
#define CONFIG_COLORBALANCE_FILTER 1
#define CONFIG_COLORCHANNELMIXER_FILTER 1
+#define CONFIG_COLORCONTRAST_FILTER 1
+#define CONFIG_COLORCORRECT_FILTER 1
+#define CONFIG_COLORIZE_FILTER 1
#define CONFIG_COLORKEY_FILTER 1
#define CONFIG_COLORKEY_OPENCL_FILTER 0
#define CONFIG_COLORHOLD_FILTER 1
@@ -2014,6 +2025,7 @@
#define CONFIG_EROSION_FILTER 1
#define CONFIG_EROSION_OPENCL_FILTER 0
#define CONFIG_ESTDIF_FILTER 1
+#define CONFIG_EXPOSURE_FILTER 1
#define CONFIG_EXTRACTPLANES_FILTER 1
#define CONFIG_FADE_FILTER 1
#define CONFIG_FFTDNOIZ_FILTER 1
@@ -2086,6 +2098,7 @@
#define CONFIG_MIDEQUALIZER_FILTER 1
#define CONFIG_MINTERPOLATE_FILTER 1
#define CONFIG_MIX_FILTER 1
+#define CONFIG_MONOCHROME_FILTER 1
#define CONFIG_MPDECIMATE_FILTER 1
#define CONFIG_NEGATE_FILTER 1
#define CONFIG_NLMEANS_FILTER 1
@@ -2216,6 +2229,7 @@
#define CONFIG_VIBRANCE_FILTER 1
#define CONFIG_VIDSTABDETECT_FILTER 0
#define CONFIG_VIDSTABTRANSFORM_FILTER 0
+#define CONFIG_VIF_FILTER 1
#define CONFIG_VIGNETTE_FILTER 1
#define CONFIG_VMAFMOTION_FILTER 1
#define CONFIG_VPP_QSV_FILTER 1
@@ -2322,6 +2336,7 @@
#define CONFIG_BFI_DEMUXER 1
#define CONFIG_BINTEXT_DEMUXER 1
#define CONFIG_BINK_DEMUXER 1
+#define CONFIG_BINKA_DEMUXER 1
#define CONFIG_BIT_DEMUXER 1
#define CONFIG_BMV_DEMUXER 1
#define CONFIG_BFSTM_DEMUXER 1
@@ -2513,6 +2528,7 @@
#define CONFIG_SER_DEMUXER 1
#define CONFIG_SHORTEN_DEMUXER 1
#define CONFIG_SIFF_DEMUXER 1
+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 1
#define CONFIG_SLN_DEMUXER 1
#define CONFIG_SMACKER_DEMUXER 1
#define CONFIG_SMJPEG_DEMUXER 1
@@ -2597,6 +2613,7 @@
#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 1
#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 1
#define CONFIG_LIBGME_DEMUXER 1
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index 3aaf147ec11e9b781b687eb0209ed3ef703100ec..f78f003303f373134d0c233aa9b1f5396a53a803 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -177,7 +177,6 @@
-
@@ -274,7 +273,6 @@
-
@@ -341,6 +339,7 @@
+
@@ -371,7 +370,6 @@
-
@@ -403,6 +401,7 @@
+
@@ -474,6 +473,7 @@
+
@@ -499,6 +499,7 @@
+
@@ -593,6 +594,7 @@
+
@@ -603,6 +605,7 @@
+
@@ -733,6 +736,7 @@
+
@@ -765,7 +769,6 @@
-
@@ -926,6 +929,7 @@
+
@@ -964,6 +968,7 @@
+
@@ -996,6 +1001,7 @@
+
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index 079f1aee1120c159626f7cd91bd9d5a95d885445..b0f51335d656d5a163b2c1bddad15f2efb3dadd7 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -381,9 +381,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -672,9 +669,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -873,6 +867,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -963,9 +960,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -1059,6 +1053,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -1272,6 +1269,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -1347,6 +1347,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -1629,6 +1632,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -1659,6 +1665,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -2049,6 +2058,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -2145,9 +2157,6 @@
Source Files\libavcodec
-
- Source Files\libavcodec
-
Source Files\libavcodec
@@ -2628,6 +2637,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -2742,6 +2754,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
@@ -2838,6 +2853,9 @@
Source Files\libavcodec
+
+ Source Files\libavcodec
+
Source Files\libavcodec
diff --git a/SMP/libavcodec/bsf_list.c b/SMP/libavcodec/bsf_list.c
index 4c4ca928cc7f7d14263f17e3b98ba473fd7c85d1..0bd374f8dc180820cb1f156d31e13dc7a5896532 100644
--- a/SMP/libavcodec/bsf_list.c
+++ b/SMP/libavcodec/bsf_list.c
@@ -48,6 +48,7 @@ static const AVBitStreamFilter *bitstream_filters[] = {
&ff_pcm_rechunk_bsf,
&ff_prores_metadata_bsf,
&ff_remove_extradata_bsf,
+ &ff_setts_bsf,
&ff_text2movsub_bsf,
&ff_trace_headers_bsf,
&ff_truehd_core_bsf,
diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
index 87f58f9d54b46767c2ad1da4829842016f3325a9..266949ec7b504133c01c329d2ad59b205e88ee9b 100644
--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -37,6 +37,7 @@ static const AVCodec *codec_list[] = {
&ff_dnxhd_encoder,
&ff_dpx_encoder,
&ff_dvvideo_encoder,
+ &ff_exr_encoder,
&ff_ffv1_encoder,
&ff_ffvhuff_encoder,
&ff_fits_encoder,
@@ -62,6 +63,7 @@ static const AVCodec *codec_list[] = {
&ff_pam_encoder,
&ff_pbm_encoder,
&ff_pcx_encoder,
+ &ff_pfm_encoder,
&ff_pgm_encoder,
&ff_pgmyuv_encoder,
&ff_png_encoder,
@@ -394,6 +396,7 @@ static const AVCodec *codec_list[] = {
&ff_sgi_decoder,
&ff_sgirle_decoder,
&ff_sheervideo_decoder,
+ &ff_simbiosis_imx_decoder,
&ff_smacker_decoder,
&ff_smc_decoder,
&ff_smvjpeg_decoder,
diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
index bdbc937f94d34a4b2f5e16de9dfa0f943a3d83d3..9c1a0df980a5fe8a05ac46db42f2855b08f39089 100644
--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -186,6 +186,7 @@ void ff_h264qpel_init_aarch64(H264QpelContext *c, int bit_depth) {return;}
void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth) {return;}
void ff_h264qpel_init_mips(H264QpelContext *c, int bit_depth) {return;}
void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth) {return;}
+void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) {return;}
void ff_hevc_dsp_init_arm(HEVCDSPContext *c, const int bit_depth) {return;}
void ff_hevc_dsp_init_mips(HEVCDSPContext *c, const int bit_depth) {return;}
void ff_hevc_dsp_init_ppc(HEVCDSPContext *c, const int bit_depth) {return;}
diff --git a/SMP/libavcodec/parser_list.c b/SMP/libavcodec/parser_list.c
index a42b3b0aa89721993a0f1b5ed88e528f9c8a1191..6c5d9b10009beba91b8e2c9c79a1a813c34591e6 100644
--- a/SMP/libavcodec/parser_list.c
+++ b/SMP/libavcodec/parser_list.c
@@ -29,6 +29,7 @@ static const AVCodecParser *parser_list[] = {
&ff_bmp_parser,
&ff_cavsvideo_parser,
&ff_cook_parser,
+ &ff_cri_parser,
&ff_dca_parser,
&ff_dirac_parser,
&ff_dnxhd_parser,
@@ -68,5 +69,6 @@ static const AVCodecParser *parser_list[] = {
&ff_vp8_parser,
&ff_vp9_parser,
&ff_webp_parser,
+ &ff_xbm_parser,
&ff_xma_parser,
NULL };
\ No newline at end of file
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index 3b5f73daa196727f686f6c8efbe5f72618758527..ca5de438d840e155acd523942f4f3bb7f881e695 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -115,6 +115,7 @@
+
@@ -130,6 +131,7 @@
+
@@ -241,6 +243,9 @@
+
+
+
@@ -281,6 +286,7 @@
+
@@ -330,6 +336,7 @@
+
@@ -396,6 +403,7 @@
+
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 976bc243c4aabe8eea87e1ad5b8660638b7742ad..1f6a45d182a8ce0b51743195816813193ff42376 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -198,6 +198,9 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
Source Files\libavfilter
@@ -243,6 +246,9 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
Source Files\libavfilter
@@ -576,6 +582,15 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
+
+ Source Files\libavfilter
+
+
+ Source Files\libavfilter
+
Source Files\libavfilter
@@ -696,6 +711,9 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
Source Files\libavfilter
@@ -843,6 +861,9 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
Source Files\libavfilter
@@ -1041,6 +1062,9 @@
Source Files\libavfilter
+
+ Source Files\libavfilter
+
Source Files\libavfilter
diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c
index 5990d90b4b07e76575c000b405a0df8046df3aa7..a8fc3a095628e189e7bf53a58e99ca0aa72f8bd3 100644
--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -35,6 +35,7 @@ static const AVFilter *filter_list[] = {
&ff_af_aecho,
&ff_af_aemphasis,
&ff_af_aeval,
+ &ff_af_aexciter,
&ff_af_afade,
&ff_af_afftdn,
&ff_af_afftfilt,
@@ -166,6 +167,9 @@ static const AVFilter *filter_list[] = {
&ff_vf_codecview,
&ff_vf_colorbalance,
&ff_vf_colorchannelmixer,
+ &ff_vf_colorcontrast,
+ &ff_vf_colorcorrect,
+ &ff_vf_colorize,
&ff_vf_colorkey,
&ff_vf_colorhold,
&ff_vf_colorlevels,
@@ -212,6 +216,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_eq,
&ff_vf_erosion,
&ff_vf_estdif,
+ &ff_vf_exposure,
&ff_vf_extractplanes,
&ff_vf_fade,
&ff_vf_fftdnoiz,
@@ -281,6 +286,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_midequalizer,
&ff_vf_minterpolate,
&ff_vf_mix,
+ &ff_vf_monochrome,
&ff_vf_mpdecimate,
&ff_vf_negate,
&ff_vf_nlmeans,
@@ -385,6 +391,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_vflip,
&ff_vf_vfrdet,
&ff_vf_vibrance,
+ &ff_vf_vif,
&ff_vf_vignette,
&ff_vf_vmafmotion,
&ff_vf_vpp_qsv,
diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj
index a215f2e793c9d34a558ef938ddb216096386adce..071cc1b5a2054d6078dea6ca4362fa639f71ff7f 100644
--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -63,7 +63,6 @@
-
@@ -72,7 +71,6 @@
-
@@ -80,6 +78,7 @@
+
@@ -137,6 +136,7 @@
+
@@ -176,13 +176,13 @@
-
+
@@ -309,6 +309,7 @@
+
@@ -438,6 +439,7 @@
+
@@ -483,6 +485,7 @@
+
diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
index 077e48e56bb888b9c152e3d2985c6511ac2b7fd6..5eefea4118c19d34a2f3454650e8751772433d20 100644
--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -40,9 +40,6 @@
Source Files\libavformat
-
- Source Files\libavformat
-
Source Files\libavformat
@@ -67,9 +64,6 @@
Source Files\libavformat
-
- Source Files\libavformat
-
Source Files\libavformat
@@ -91,6 +85,9 @@
Source Files\libavformat
+
+ Source Files\libavformat
+
Source Files\libavformat
@@ -262,6 +259,9 @@
Source Files\libavformat
+
+ Source Files\libavformat
+
Source Files\libavformat
@@ -379,9 +379,6 @@
Source Files\libavformat
-
- Source Files\libavformat
-
Source Files\libavformat
@@ -400,6 +397,9 @@
Source Files\libavformat
+
+ Source Files\libavformat
+
Source Files\libavformat
@@ -778,6 +778,9 @@
Source Files\libavformat
+
+ Source Files\libavformat
+
Source Files\libavformat
@@ -1165,6 +1168,9 @@
Source Files\libavformat
+
+ Source Files\libavformat
+
Source Files\libavformat
@@ -1300,6 +1306,9 @@
Source Files\libavformat
+
+ Source Files\libavformat
+
Source Files\libavformat
diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c
index 5b086546d5a0dc4345bf2de528b63a1d9e117630..1be3ddfbd3d809ff3a0d98a57f4801c2babec584 100644
--- a/SMP/libavformat/demuxer_list.c
+++ b/SMP/libavformat/demuxer_list.c
@@ -63,6 +63,7 @@ static const AVInputFormat *demuxer_list[] = {
&ff_bfi_demuxer,
&ff_bintext_demuxer,
&ff_bink_demuxer,
+ &ff_binka_demuxer,
&ff_bit_demuxer,
&ff_bmv_demuxer,
&ff_bfstm_demuxer,
@@ -254,6 +255,7 @@ static const AVInputFormat *demuxer_list[] = {
&ff_ser_demuxer,
&ff_shorten_demuxer,
&ff_siff_demuxer,
+ &ff_simbiosis_imx_demuxer,
&ff_sln_demuxer,
&ff_smacker_demuxer,
&ff_smjpeg_demuxer,
@@ -338,6 +340,7 @@ static const AVInputFormat *demuxer_list[] = {
&ff_image_sunrast_pipe_demuxer,
&ff_image_tiff_pipe_demuxer,
&ff_image_webp_pipe_demuxer,
+ &ff_image_xbm_pipe_demuxer,
&ff_image_xpm_pipe_demuxer,
&ff_image_xwd_pipe_demuxer,
&ff_libgme_demuxer,
diff --git a/SMP/libswscale.vcxproj b/SMP/libswscale.vcxproj
index b82558e967652fcbaf4f3c234d12e8b3375667f9..2f339ce46ced0ed1306fa18ca5dff1e2858e1570 100644
--- a/SMP/libswscale.vcxproj
+++ b/SMP/libswscale.vcxproj
@@ -65,6 +65,7 @@
+
diff --git a/SMP/libswscale.vcxproj.filters b/SMP/libswscale.vcxproj.filters
index 181153cd276d3fa3d2aa71f4c8730e1a0bde5f98..f772c7d77de53038f7034a4c552b8e01ba79c8ea 100644
--- a/SMP/libswscale.vcxproj.filters
+++ b/SMP/libswscale.vcxproj.filters
@@ -49,6 +49,9 @@
Source Files\libswscale\x86
+
+ Source Files\libswscale\x86
+