project: Update for recent upstream merge.

1c904eef · Matt Oliver · 71949e66 · 1c904eef · 1c904eef · 1c904eef
13 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -433,6 +433,7 @@
 %define CONFIG_LIBX264 1
 %define CONFIG_LIBX265 1
 %define CONFIG_LIBXAVS 0
+%define CONFIG_LIBXAVS2 0
 %define CONFIG_LIBXVID 1
 %define CONFIG_DECKLINK 0
 %define CONFIG_LIBNDI_NEWTEK 0
@@ -471,6 +472,7 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 1
 %define CONFIG_LIBJACK 0
+%define CONFIG_LIBKLVANC 0
 %define CONFIG_LIBKVAZAAR 0
 %define CONFIG_LIBMODPLUG 1
 %define CONFIG_LIBMP3LAME 1
@@ -559,15 +561,15 @@
 %define CONFIG_GPL 1
 %define CONFIG_NONFREE 0
 %define CONFIG_VERSION3 1
-%define CONFIG_AVCODEC 1
 %define CONFIG_AVDEVICE 1
 %define CONFIG_AVFILTER 1
+%define CONFIG_SWSCALE 1
+%define CONFIG_POSTPROC 1
 %define CONFIG_AVFORMAT 1
+%define CONFIG_AVCODEC 1
+%define CONFIG_SWRESAMPLE 1
 %define CONFIG_AVRESAMPLE 0
 %define CONFIG_AVUTIL 1
-%define CONFIG_POSTPROC 1
-%define CONFIG_SWRESAMPLE 1
-%define CONFIG_SWSCALE 1
 %define CONFIG_FFPLAY 1
 %define CONFIG_FFPROBE 1
 %define CONFIG_FFMPEG 1
@@ -739,6 +741,7 @@
 %define CONFIG_BETHSOFTVID_DECODER 1
 %define CONFIG_BFI_DECODER 1
 %define CONFIG_BINK_DECODER 1
+%define CONFIG_BITPACKED_DECODER 1
 %define CONFIG_BMP_DECODER 1
 %define CONFIG_BMV_VIDEO_DECODER 1
 %define CONFIG_BRENDER_PIX_DECODER 1
@@ -815,6 +818,7 @@
 %define CONFIG_HUFFYUV_DECODER 1
 %define CONFIG_IDCIN_DECODER 1
 %define CONFIG_IFF_ILBM_DECODER 1
+%define CONFIG_IMM4_DECODER 1
 %define CONFIG_INDEO2_DECODER 1
 %define CONFIG_INDEO3_DECODER 1
 %define CONFIG_INDEO4_DECODER 1
@@ -862,6 +866,7 @@
 %define CONFIG_MTS2_DECODER 1
 %define CONFIG_MVC1_DECODER 1
 %define CONFIG_MVC2_DECODER 1
+%define CONFIG_MWSC_DECODER 1
 %define CONFIG_MXPEG_DECODER 1
 %define CONFIG_NUV_DECODER 1
 %define CONFIG_PAF_VIDEO_DECODER 1
@@ -875,6 +880,7 @@
 %define CONFIG_PNG_DECODER 1
 %define CONFIG_PPM_DECODER 1
 %define CONFIG_PRORES_DECODER 1
+%define CONFIG_PROSUMER_DECODER 1
 %define CONFIG_PSD_DECODER 1
 %define CONFIG_PTX_DECODER 1
 %define CONFIG_QDRAW_DECODER 1
@@ -882,6 +888,7 @@
 %define CONFIG_QTRLE_DECODER 1
 %define CONFIG_R10K_DECODER 1
 %define CONFIG_R210_DECODER 1
+%define CONFIG_RASC_DECODER 1
 %define CONFIG_RAWVIDEO_DECODER 1
 %define CONFIG_RL2_DECODER 1
 %define CONFIG_ROQ_DECODER 1
@@ -954,8 +961,8 @@
 %define CONFIG_VP9_RKMPP_DECODER 0
 %define CONFIG_VP9_V4L2M2M_DECODER 0
 %define CONFIG_VQA_DECODER 1
-%define CONFIG_BITPACKED_DECODER 1
 %define CONFIG_WEBP_DECODER 1
+%define CONFIG_WCMV_DECODER 1
 %define CONFIG_WRAPPED_AVFRAME_DECODER 1
 %define CONFIG_WMV1_DECODER 1
 %define CONFIG_WMV2_DECODER 1
@@ -1404,6 +1411,7 @@
 %define CONFIG_LIBX264RGB_ENCODER 1
 %define CONFIG_LIBX265_ENCODER 1
 %define CONFIG_LIBXAVS_ENCODER 0
+%define CONFIG_LIBXAVS2_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 1
 %define CONFIG_H263_V4L2M2M_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
@@ -1565,6 +1573,7 @@
 %define CONFIG_ACOMPRESSOR_FILTER 1
 %define CONFIG_ACONTRAST_FILTER 1
 %define CONFIG_ACOPY_FILTER 1
+%define CONFIG_ACUE_FILTER 1
 %define CONFIG_ACROSSFADE_FILTER 1
 %define CONFIG_ACRUSHER_FILTER 1
 %define CONFIG_ADECLICK_FILTER 1
@@ -1702,6 +1711,7 @@
 %define CONFIG_COVER_RECT_FILTER 1
 %define CONFIG_CROP_FILTER 1
 %define CONFIG_CROPDETECT_FILTER 1
+%define CONFIG_CUE_FILTER 1
 %define CONFIG_CURVES_FILTER 1
 %define CONFIG_DATASCOPE_FILTER 1
 %define CONFIG_DCTDNOIZ_FILTER 1
@@ -1720,6 +1730,7 @@
 %define CONFIG_DESPILL_FILTER 1
 %define CONFIG_DETELECINE_FILTER 1
 %define CONFIG_DILATION_FILTER 1
+%define CONFIG_DILATION_OPENCL_FILTER 0
 %define CONFIG_DISPLACE_FILTER 1
 %define CONFIG_DOUBLEWEAVE_FILTER 1
 %define CONFIG_DRAWBOX_FILTER 1
@@ -1731,6 +1742,7 @@
 %define CONFIG_ENTROPY_FILTER 1
 %define CONFIG_EQ_FILTER 1
 %define CONFIG_EROSION_FILTER 1
+%define CONFIG_EROSION_OPENCL_FILTER 0
 %define CONFIG_EXTRACTPLANES_FILTER 1
 %define CONFIG_FADE_FILTER 1
 %define CONFIG_FFTDNOIZ_FILTER 1
@@ -1779,6 +1791,7 @@
 %define CONFIG_LOOP_FILTER 1
 %define CONFIG_LUMAKEY_FILTER 1
 %define CONFIG_LUT_FILTER 1
+%define CONFIG_LUT1D_FILTER 1
 %define CONFIG_LUT2_FILTER 1
 %define CONFIG_LUT3D_FILTER 1
 %define CONFIG_LUTRGB_FILTER 1
@@ -1888,6 +1901,7 @@
 %define CONFIG_TONEMAP_FILTER 1
 %define CONFIG_TONEMAP_OPENCL_FILTER 0
 %define CONFIG_TRANSPOSE_FILTER 1
+%define CONFIG_TRANSPOSE_NPP_FILTER 0
 %define CONFIG_TRIM_FILTER 1
 %define CONFIG_UNPREMULTIPLY_FILTER 1
 %define CONFIG_UNSHARP_FILTER 1
@@ -1982,6 +1996,7 @@
 %define CONFIG_AVISYNTH_DEMUXER 1
 %define CONFIG_AVR_DEMUXER 1
 %define CONFIG_AVS_DEMUXER 1
+%define CONFIG_AVS2_DEMUXER 1
 %define CONFIG_BETHSOFTVID_DEMUXER 1
 %define CONFIG_BFI_DEMUXER 1
 %define CONFIG_BINTEXT_DEMUXER 1
@@ -2258,6 +2273,7 @@
 %define CONFIG_AU_MUXER 1
 %define CONFIG_AVI_MUXER 1
 %define CONFIG_AVM2_MUXER 1
+%define CONFIG_AVS2_MUXER 1
 %define CONFIG_BIT_MUXER 1
 %define CONFIG_CAF_MUXER 1
 %define CONFIG_CAVSVIDEO_MUXER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -483,6 +483,7 @@
 #define CONFIG_LIBX264 1
 #define CONFIG_LIBX265 1
 #define CONFIG_LIBXAVS 0
+#define CONFIG_LIBXAVS2 0
 #define CONFIG_LIBXVID 1
 #define CONFIG_DECKLINK 0
 #define CONFIG_LIBNDI_NEWTEK 0
@@ -521,6 +522,7 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 1
 #define CONFIG_LIBJACK 0
+#define CONFIG_LIBKLVANC 0
 #define CONFIG_LIBKVAZAAR 0
 #define CONFIG_LIBMODPLUG 1
 #define CONFIG_LIBMP3LAME 1
@@ -624,15 +626,15 @@
 #define CONFIG_GPL 1
 #define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 1
-#define CONFIG_AVCODEC 1
 #define CONFIG_AVDEVICE 1
 #define CONFIG_AVFILTER 1
+#define CONFIG_SWSCALE 1
+#define CONFIG_POSTPROC 1
 #define CONFIG_AVFORMAT 1
+#define CONFIG_AVCODEC 1
+#define CONFIG_SWRESAMPLE 1
 #define CONFIG_AVRESAMPLE 0
 #define CONFIG_AVUTIL 1
-#define CONFIG_POSTPROC 1
-#define CONFIG_SWRESAMPLE 1
-#define CONFIG_SWSCALE 1
 #define CONFIG_FFPLAY 1
 #define CONFIG_FFPROBE 1
 #define CONFIG_FFMPEG 1
@@ -804,6 +806,7 @@
 #define CONFIG_BETHSOFTVID_DECODER 1
 #define CONFIG_BFI_DECODER 1
 #define CONFIG_BINK_DECODER 1
+#define CONFIG_BITPACKED_DECODER 1
 #define CONFIG_BMP_DECODER 1
 #define CONFIG_BMV_VIDEO_DECODER 1
 #define CONFIG_BRENDER_PIX_DECODER 1
@@ -880,6 +883,7 @@
 #define CONFIG_HUFFYUV_DECODER 1
 #define CONFIG_IDCIN_DECODER 1
 #define CONFIG_IFF_ILBM_DECODER 1
+#define CONFIG_IMM4_DECODER 1
 #define CONFIG_INDEO2_DECODER 1
 #define CONFIG_INDEO3_DECODER 1
 #define CONFIG_INDEO4_DECODER 1
@@ -927,6 +931,7 @@
 #define CONFIG_MTS2_DECODER 1
 #define CONFIG_MVC1_DECODER 1
 #define CONFIG_MVC2_DECODER 1
+#define CONFIG_MWSC_DECODER 1
 #define CONFIG_MXPEG_DECODER 1
 #define CONFIG_NUV_DECODER 1
 #define CONFIG_PAF_VIDEO_DECODER 1
@@ -940,6 +945,7 @@
 #define CONFIG_PNG_DECODER 1
 #define CONFIG_PPM_DECODER 1
 #define CONFIG_PRORES_DECODER 1
+#define CONFIG_PROSUMER_DECODER 1
 #define CONFIG_PSD_DECODER 1
 #define CONFIG_PTX_DECODER 1
 #define CONFIG_QDRAW_DECODER 1
@@ -947,6 +953,7 @@
 #define CONFIG_QTRLE_DECODER 1
 #define CONFIG_R10K_DECODER 1
 #define CONFIG_R210_DECODER 1
+#define CONFIG_RASC_DECODER 1
 #define CONFIG_RAWVIDEO_DECODER 1
 #define CONFIG_RL2_DECODER 1
 #define CONFIG_ROQ_DECODER 1
@@ -1019,8 +1026,8 @@
 #define CONFIG_VP9_RKMPP_DECODER 0
 #define CONFIG_VP9_V4L2M2M_DECODER 0
 #define CONFIG_VQA_DECODER 1
-#define CONFIG_BITPACKED_DECODER 1
 #define CONFIG_WEBP_DECODER 1
+#define CONFIG_WCMV_DECODER 1
 #define CONFIG_WRAPPED_AVFRAME_DECODER 1
 #define CONFIG_WMV1_DECODER 1
 #define CONFIG_WMV2_DECODER 1
@@ -1469,6 +1476,7 @@
 #define CONFIG_LIBX264RGB_ENCODER 1
 #define CONFIG_LIBX265_ENCODER 1
 #define CONFIG_LIBXAVS_ENCODER 0
+#define CONFIG_LIBXAVS2_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 1
 #define CONFIG_H263_V4L2M2M_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
@@ -1651,6 +1659,7 @@
 #define CONFIG_ACOMPRESSOR_FILTER 1
 #define CONFIG_ACONTRAST_FILTER 1
 #define CONFIG_ACOPY_FILTER 1
+#define CONFIG_ACUE_FILTER 1
 #define CONFIG_ACROSSFADE_FILTER 1
 #define CONFIG_ACRUSHER_FILTER 1
 #define CONFIG_ADECLICK_FILTER 1
@@ -1788,6 +1797,7 @@
 #define CONFIG_COVER_RECT_FILTER 1
 #define CONFIG_CROP_FILTER 1
 #define CONFIG_CROPDETECT_FILTER 1
+#define CONFIG_CUE_FILTER 1
 #define CONFIG_CURVES_FILTER 1
 #define CONFIG_DATASCOPE_FILTER 1
 #define CONFIG_DCTDNOIZ_FILTER 1
@@ -1806,6 +1816,7 @@
 #define CONFIG_DESPILL_FILTER 1
 #define CONFIG_DETELECINE_FILTER 1
 #define CONFIG_DILATION_FILTER 1
+#define CONFIG_DILATION_OPENCL_FILTER 0
 #define CONFIG_DISPLACE_FILTER 1
 #define CONFIG_DOUBLEWEAVE_FILTER 1
 #define CONFIG_DRAWBOX_FILTER 1
@@ -1817,6 +1828,7 @@
 #define CONFIG_ENTROPY_FILTER 1
 #define CONFIG_EQ_FILTER 1
 #define CONFIG_EROSION_FILTER 1
+#define CONFIG_EROSION_OPENCL_FILTER 0
 #define CONFIG_EXTRACTPLANES_FILTER 1
 #define CONFIG_FADE_FILTER 1
 #define CONFIG_FFTDNOIZ_FILTER 1
@@ -1865,6 +1877,7 @@
 #define CONFIG_LOOP_FILTER 1
 #define CONFIG_LUMAKEY_FILTER 1
 #define CONFIG_LUT_FILTER 1
+#define CONFIG_LUT1D_FILTER 1
 #define CONFIG_LUT2_FILTER 1
 #define CONFIG_LUT3D_FILTER 1
 #define CONFIG_LUTRGB_FILTER 1
@@ -1974,6 +1987,7 @@
 #define CONFIG_TONEMAP_FILTER 1
 #define CONFIG_TONEMAP_OPENCL_FILTER 0
 #define CONFIG_TRANSPOSE_FILTER 1
+#define CONFIG_TRANSPOSE_NPP_FILTER 0
 #define CONFIG_TRIM_FILTER 1
 #define CONFIG_UNPREMULTIPLY_FILTER 1
 #define CONFIG_UNSHARP_FILTER 1
@@ -2068,6 +2082,7 @@
 #define CONFIG_AVISYNTH_DEMUXER 1
 #define CONFIG_AVR_DEMUXER 1
 #define CONFIG_AVS_DEMUXER 1
+#define CONFIG_AVS2_DEMUXER 1
 #define CONFIG_BETHSOFTVID_DEMUXER 1
 #define CONFIG_BFI_DEMUXER 1
 #define CONFIG_BINTEXT_DEMUXER 1
@@ -2344,6 +2359,7 @@
 #define CONFIG_AU_MUXER 1
 #define CONFIG_AVI_MUXER 1
 #define CONFIG_AVM2_MUXER 1
+#define CONFIG_AVS2_MUXER 1
 #define CONFIG_BIT_MUXER 1
 #define CONFIG_CAF_MUXER 1
 #define CONFIG_CAVSVIDEO_MUXER 1

--- a/SMP/libavcodec.def
+++ b/SMP/libavcodec.def
@@ -6,6 +6,7 @@ EXPORTS
    av_bitstream_filter_init
    av_bitstream_filter_next
    av_bsf_alloc
+    av_bsf_flush
    av_bsf_free
    av_bsf_get_by_name
    av_bsf_get_class
@@ -202,6 +203,7 @@ EXPORTS
    avpriv_dca_convert_bitstream
    avpriv_dca_parse_core_frame_header
    avpriv_dnxhd_get_frame_size
+    avpriv_dnxhd_get_hr_frame_size
    avpriv_dnxhd_get_interlaced
    avpriv_do_elbg
    avpriv_exif_decode_ifd

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -552,6 +552,7 @@
    <ClCompile Include="..\libavcodec\idcinvideo.c" />
    <ClCompile Include="..\libavcodec\iff.c" />
    <ClCompile Include="..\libavcodec\imc.c" />
+    <ClCompile Include="..\libavcodec\imm4.c" />
    <ClCompile Include="..\libavcodec\indeo2.c" />
    <ClCompile Include="..\libavcodec\indeo3.c" />
    <ClCompile Include="..\libavcodec\indeo4.c" />
@@ -625,6 +626,7 @@
    <ClCompile Include="..\libavcodec\lcldec.c" />
    <ClCompile Include="..\libavcodec\mss4.c" />
    <ClCompile Include="..\libavcodec\mvcdec.c" />
+    <ClCompile Include="..\libavcodec\mwsc.c" />
    <ClCompile Include="..\libavcodec\mxpegdec.c" />
    <ClCompile Include="..\libavcodec\nellymoserdec.c" />
    <ClCompile Include="..\libavcodec\nellymoser.c" />
@@ -658,6 +660,7 @@
    <ClCompile Include="..\libavcodec\proresdata.c" />
    <ClCompile Include="..\libavcodec\proresenc_anatoliy.c" />
    <ClCompile Include="..\libavcodec\proresenc_kostya.c" />
+    <ClCompile Include="..\libavcodec\prosumer.c" />
    <ClCompile Include="..\libavcodec\psd.c" />
    <ClCompile Include="..\libavcodec\ptx.c" />
    <ClCompile Include="..\libavcodec\qcelpdec.c" />
@@ -672,6 +675,7 @@
    <ClCompile Include="..\libavcodec\ra144enc.c" />
    <ClCompile Include="..\libavcodec\ra288.c" />
    <ClCompile Include="..\libavcodec\ralf.c" />
+    <ClCompile Include="..\libavcodec\rasc.c" />
    <ClCompile Include="..\libavcodec\rawdec.c" />
    <ClCompile Include="..\libavcodec\rawenc.c" />
    <ClCompile Include="..\libavcodec\realtextdec.c" />
@@ -799,6 +803,7 @@
    <ClCompile Include="..\libavcodec\vqavideo.c" />
    <ClCompile Include="..\libavcodec\wavpack.c" />
    <ClCompile Include="..\libavcodec\wavpackenc.c" />
+    <ClCompile Include="..\libavcodec\wcmv.c" />
    <ClCompile Include="..\libavcodec\webp.c" />
    <ClCompile Include="..\libavcodec\webvttdec.c" />
    <ClCompile Include="..\libavcodec\webvttenc.c" />

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -1479,6 +1479,9 @@
    <ClCompile Include="..\libavcodec\imc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\imm4.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\indeo2.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1698,6 +1701,9 @@
    <ClCompile Include="..\libavcodec\mvcdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\mwsc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\mxpegdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1797,6 +1803,9 @@
    <ClCompile Include="..\libavcodec\proresenc_kostya.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\prosumer.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\psd.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1839,6 +1848,9 @@
    <ClCompile Include="..\libavcodec\ralf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\rasc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\rawdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2220,6 +2232,9 @@
    <ClCompile Include="..\libavcodec\wavpackenc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\wcmv.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\webp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -213,6 +213,7 @@ static const AVCodec *codec_list[] = {
    &ff_bethsoftvid_decoder,
    &ff_bfi_decoder,
    &ff_bink_decoder,
+    &ff_bitpacked_decoder,
    &ff_bmp_decoder,
    &ff_bmv_video_decoder,
    &ff_brender_pix_decoder,
@@ -281,6 +282,7 @@ static const AVCodec *codec_list[] = {
    &ff_huffyuv_decoder,
    &ff_idcin_decoder,
    &ff_iff_ilbm_decoder,
+    &ff_imm4_decoder,
    &ff_indeo2_decoder,
    &ff_indeo3_decoder,
    &ff_indeo4_decoder,
@@ -319,6 +321,7 @@ static const AVCodec *codec_list[] = {
    &ff_mts2_decoder,
    &ff_mvc1_decoder,
    &ff_mvc2_decoder,
+    &ff_mwsc_decoder,
    &ff_mxpeg_decoder,
    &ff_nuv_decoder,
    &ff_paf_video_decoder,
@@ -332,6 +335,7 @@ static const AVCodec *codec_list[] = {
    &ff_png_decoder,
    &ff_ppm_decoder,
    &ff_prores_decoder,
+    &ff_prosumer_decoder,
    &ff_psd_decoder,
    &ff_ptx_decoder,
    &ff_qdraw_decoder,
@@ -339,6 +343,7 @@ static const AVCodec *codec_list[] = {
    &ff_qtrle_decoder,
    &ff_r10k_decoder,
    &ff_r210_decoder,
+    &ff_rasc_decoder,
    &ff_rawvideo_decoder,
    &ff_rl2_decoder,
    &ff_roq_decoder,
@@ -404,8 +409,8 @@ static const AVCodec *codec_list[] = {
    &ff_vp8_decoder,
    &ff_vp9_decoder,
    &ff_vqa_decoder,
-    &ff_bitpacked_decoder,
    &ff_webp_decoder,
+    &ff_wcmv_decoder,
    &ff_wrapped_avframe_decoder,
    &ff_wmv1_decoder,
    &ff_wmv2_decoder,

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -123,6 +123,7 @@
    <ClCompile Include="..\libavfilter\af_acopy.c" />
    <ClCompile Include="..\libavfilter\af_afade.c" />
    <ClCompile Include="..\libavfilter\af_acrusher.c" />
+    <ClCompile Include="..\libavfilter\f_cue.c" />
    <ClCompile Include="..\libavfilter\af_adeclick.c" />
    <ClCompile Include="..\libavfilter\af_adelay.c" />
    <ClCompile Include="..\libavfilter\af_aderivative.c" />

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -192,6 +192,9 @@
    <ClCompile Include="..\libavfilter\af_acrusher.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\f_cue.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\af_adeclick.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>

--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -23,6 +23,7 @@ static const AVFilter *filter_list[] = {
    &ff_af_acompressor,
    &ff_af_acontrast,
    &ff_af_acopy,
+    &ff_af_acue,
    &ff_af_acrossfade,
    &ff_af_acrusher,
    &ff_af_adeclick,
@@ -148,6 +149,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_cover_rect,
    &ff_vf_crop,
    &ff_vf_cropdetect,
+    &ff_vf_cue,
    &ff_vf_curves,
    &ff_vf_datascope,
    &ff_vf_dctdnoiz,
@@ -220,6 +222,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_loop,
    &ff_vf_lumakey,
    &ff_vf_lut,
+    &ff_vf_lut1d,
    &ff_vf_lut2,
    &ff_vf_lut3d,
    &ff_vf_lutrgb,

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -179,6 +179,7 @@
    <ClCompile Include="..\libavformat\voc_packet.c" />
    <ClCompile Include="..\libavformat\vocdec.c" />
    <ClCompile Include="..\libavformat\voc.c" />
+    <ClCompile Include="..\libavformat\davs2.c" />
    <ClCompile Include="..\libavformat\bethsoftvid.c" />
    <ClCompile Include="..\libavformat\bfi.c" />
    <ClCompile Include="..\libavformat\bink.c" />
@@ -302,6 +303,7 @@
    <ClCompile Include="..\libavformat\matroskadec.c" />
    <ClCompile Include="..\libavformat\matroska.c" />
    <ClCompile Include="..\libavformat\matroskaenc.c" />
+    <ClCompile Include="..\libavformat\av1.c" />
    <ClCompile Include="..\libavformat\hevc.c" />
    <ClCompile Include="..\libavformat\wv.c" />
    <ClCompile Include="..\libavformat\webmdashenc.c" />
@@ -316,7 +318,6 @@
    <ClCompile Include="..\libavformat\mmf.c" />
    <ClCompile Include="..\libavformat\mov.c" />
    <ClCompile Include="..\libavformat\movenc.c" />
-    <ClCompile Include="..\libavformat\av1.c" />
    <ClCompile Include="..\libavformat\vpcc.c" />
    <ClCompile Include="..\libavformat\movenchint.c" />
    <ClCompile Include="..\libavformat\movenccenc.c" />
@@ -498,7 +499,6 @@
    <ClCompile Include="..\libavformat\avisynth.c" />
    <ClCompile Include="..\libavformat\libgme.c" />
    <ClCompile Include="..\libavformat\libmodplug.c" />
-    <ClCompile Include="..\libavformat\libssh.c" />
    <ClCompile Include="..\libavformat\async.c" />
    <ClCompile Include="..\libavformat\bluray.c" />
    <ClCompile Include="..\libavformat\cache.c" />
@@ -530,6 +530,7 @@
    <ClCompile Include="..\libavformat\tls.c" />
    <ClCompile Include="..\libavformat\tls_gnutls.c" />
    <ClCompile Include="..\libavformat\udp.c" />
+    <ClCompile Include="..\libavformat\libssh.c" />
    <ClCompile Include="libavformat\golomb_tab_wrap.c" />
    <ClCompile Include="libavformat\log2_tab_wrap.c" />
  </ItemGroup>

--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -361,6 +361,9 @@
    <ClCompile Include="..\libavformat\voc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\davs2.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\bethsoftvid.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -730,6 +733,9 @@
    <ClCompile Include="..\libavformat\matroskaenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\av1.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\hevc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -772,9 +778,6 @@
    <ClCompile Include="..\libavformat\movenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\av1.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavformat\vpcc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -1318,9 +1321,6 @@
    <ClCompile Include="..\libavformat\libmodplug.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\libssh.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavformat\async.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -1414,6 +1414,9 @@
    <ClCompile Include="..\libavformat\udp.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\libssh.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="libavformat\golomb_tab_wrap.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>

--- a/SMP/libavformat/demuxer_list.c
+++ b/SMP/libavformat/demuxer_list.c
@@ -51,6 +51,7 @@ static const AVInputFormat *demuxer_list[] = {
    &ff_avisynth_demuxer,
    &ff_avr_demuxer,
    &ff_avs_demuxer,
+    &ff_avs2_demuxer,
    &ff_bethsoftvid_demuxer,
    &ff_bfi_demuxer,
    &ff_bintext_demuxer,

--- a/SMP/libavformat/muxer_list.c
+++ b/SMP/libavformat/muxer_list.c
@@ -35,6 +35,7 @@ static const AVOutputFormat *muxer_list[] = {
    &ff_au_muxer,
    &ff_avi_muxer,
    &ff_avm2_muxer,
+    &ff_avs2_muxer,
    &ff_bit_muxer,
    &ff_caf_muxer,
    &ff_cavsvideo_muxer,