project: Update for recent upstream merge.

a36cc944 · Matt Oliver · 0b906e95 · a36cc944 · a36cc944 · a36cc944
23 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -680,6 +680,7 @@
 %define CONFIG_RTPDEC 1
 %define CONFIG_RTPENC_CHAIN 1
 %define CONFIG_RV34DSP 1
+%define CONFIG_SCENE_SAD 1
 %define CONFIG_SINEWIN 1
 %define CONFIG_SNAPPY 1
 %define CONFIG_SRTP 1
@@ -719,9 +720,11 @@
 %define CONFIG_MOV2TEXTSUB_BSF 1
 %define CONFIG_NOISE_BSF 1
 %define CONFIG_NULL_BSF 1
+%define CONFIG_PRORES_METADATA_BSF 1
 %define CONFIG_REMOVE_EXTRADATA_BSF 1
 %define CONFIG_TEXT2MOVSUB_BSF 1
 %define CONFIG_TRACE_HEADERS_BSF 1
+%define CONFIG_TRUEHD_CORE_BSF 1
 %define CONFIG_VP9_METADATA_BSF 1
 %define CONFIG_VP9_RAW_REORDER_BSF 1
 %define CONFIG_VP9_SUPERFRAME_BSF 1
@@ -1340,6 +1343,7 @@
 %define CONFIG_WMAV1_ENCODER 1
 %define CONFIG_WMAV2_ENCODER 1
 %define CONFIG_PCM_ALAW_ENCODER 1
+%define CONFIG_PCM_DVD_ENCODER 1
 %define CONFIG_PCM_F32BE_ENCODER 1
 %define CONFIG_PCM_F32LE_ENCODER 1
 %define CONFIG_PCM_F64BE_ENCODER 1
@@ -1710,6 +1714,7 @@
 %define CONFIG_BWDIF_FILTER 1
 %define CONFIG_CHROMAHOLD_FILTER 1
 %define CONFIG_CHROMAKEY_FILTER 1
+%define CONFIG_CHROMASHIFT_FILTER 1
 %define CONFIG_CIESCOPE_FILTER 1
 %define CONFIG_CODECVIEW_FILTER 1
 %define CONFIG_COLORBALANCE_FILTER 1
@@ -1734,6 +1739,7 @@
 %define CONFIG_DEBLOCK_FILTER 1
 %define CONFIG_DECIMATE_FILTER 1
 %define CONFIG_DECONVOLVE_FILTER 1
+%define CONFIG_DEDOT_FILTER 1
 %define CONFIG_DEFLATE_FILTER 1
 %define CONFIG_DEFLICKER_FILTER 1
 %define CONFIG_DEINTERLACE_QSV_FILTER 1
@@ -1774,6 +1780,7 @@
 %define CONFIG_FRAMEPACK_FILTER 1
 %define CONFIG_FRAMERATE_FILTER 1
 %define CONFIG_FRAMESTEP_FILTER 1
+%define CONFIG_FREEZEDETECT_FILTER 1
 %define CONFIG_FREI0R_FILTER 0
 %define CONFIG_FSPP_FILTER 1
 %define CONFIG_GBLUR_FILTER 1
@@ -1864,6 +1871,7 @@
 %define CONFIG_REMOVELOGO_FILTER 1
 %define CONFIG_REPEATFIELDS_FILTER 1
 %define CONFIG_REVERSE_FILTER 1
+%define CONFIG_RGBASHIFT_FILTER 1
 %define CONFIG_ROBERTS_FILTER 1
 %define CONFIG_ROBERTS_OPENCL_FILTER 0
 %define CONFIG_ROTATE_FILTER 1
@@ -1920,6 +1928,7 @@
 %define CONFIG_TPAD_FILTER 1
 %define CONFIG_TRANSPOSE_FILTER 1
 %define CONFIG_TRANSPOSE_NPP_FILTER 0
+%define CONFIG_TRANSPOSE_OPENCL_FILTER 0
 %define CONFIG_TRIM_FILTER 1
 %define CONFIG_UNPREMULTIPLY_FILTER 1
 %define CONFIG_UNSHARP_FILTER 1
@@ -2042,6 +2051,7 @@
 %define CONFIG_DAUD_DEMUXER 1
 %define CONFIG_DCSTR_DEMUXER 1
 %define CONFIG_DFA_DEMUXER 1
+%define CONFIG_DHAV_DEMUXER 1
 %define CONFIG_DIRAC_DEMUXER 1
 %define CONFIG_DNXHD_DEMUXER 1
 %define CONFIG_DSF_DEMUXER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -745,6 +745,7 @@
 #define CONFIG_RTPDEC 1
 #define CONFIG_RTPENC_CHAIN 1
 #define CONFIG_RV34DSP 1
+#define CONFIG_SCENE_SAD 1
 #define CONFIG_SINEWIN 1
 #define CONFIG_SNAPPY 1
 #define CONFIG_SRTP 1
@@ -784,9 +785,11 @@
 #define CONFIG_MOV2TEXTSUB_BSF 1
 #define CONFIG_NOISE_BSF 1
 #define CONFIG_NULL_BSF 1
+#define CONFIG_PRORES_METADATA_BSF 1
 #define CONFIG_REMOVE_EXTRADATA_BSF 1
 #define CONFIG_TEXT2MOVSUB_BSF 1
 #define CONFIG_TRACE_HEADERS_BSF 1
+#define CONFIG_TRUEHD_CORE_BSF 1
 #define CONFIG_VP9_METADATA_BSF 1
 #define CONFIG_VP9_RAW_REORDER_BSF 1
 #define CONFIG_VP9_SUPERFRAME_BSF 1
@@ -1405,6 +1408,7 @@
 #define CONFIG_WMAV1_ENCODER 1
 #define CONFIG_WMAV2_ENCODER 1
 #define CONFIG_PCM_ALAW_ENCODER 1
+#define CONFIG_PCM_DVD_ENCODER 1
 #define CONFIG_PCM_F32BE_ENCODER 1
 #define CONFIG_PCM_F32LE_ENCODER 1
 #define CONFIG_PCM_F64BE_ENCODER 1
@@ -1796,6 +1800,7 @@
 #define CONFIG_BWDIF_FILTER 1
 #define CONFIG_CHROMAHOLD_FILTER 1
 #define CONFIG_CHROMAKEY_FILTER 1
+#define CONFIG_CHROMASHIFT_FILTER 1
 #define CONFIG_CIESCOPE_FILTER 1
 #define CONFIG_CODECVIEW_FILTER 1
 #define CONFIG_COLORBALANCE_FILTER 1
@@ -1820,6 +1825,7 @@
 #define CONFIG_DEBLOCK_FILTER 1
 #define CONFIG_DECIMATE_FILTER 1
 #define CONFIG_DECONVOLVE_FILTER 1
+#define CONFIG_DEDOT_FILTER 1
 #define CONFIG_DEFLATE_FILTER 1
 #define CONFIG_DEFLICKER_FILTER 1
 #define CONFIG_DEINTERLACE_QSV_FILTER 1
@@ -1860,6 +1866,7 @@
 #define CONFIG_FRAMEPACK_FILTER 1
 #define CONFIG_FRAMERATE_FILTER 1
 #define CONFIG_FRAMESTEP_FILTER 1
+#define CONFIG_FREEZEDETECT_FILTER 1
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 1
 #define CONFIG_GBLUR_FILTER 1
@@ -1950,6 +1957,7 @@
 #define CONFIG_REMOVELOGO_FILTER 1
 #define CONFIG_REPEATFIELDS_FILTER 1
 #define CONFIG_REVERSE_FILTER 1
+#define CONFIG_RGBASHIFT_FILTER 1
 #define CONFIG_ROBERTS_FILTER 1
 #define CONFIG_ROBERTS_OPENCL_FILTER 0
 #define CONFIG_ROTATE_FILTER 1
@@ -2006,6 +2014,7 @@
 #define CONFIG_TPAD_FILTER 1
 #define CONFIG_TRANSPOSE_FILTER 1
 #define CONFIG_TRANSPOSE_NPP_FILTER 0
+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
 #define CONFIG_TRIM_FILTER 1
 #define CONFIG_UNPREMULTIPLY_FILTER 1
 #define CONFIG_UNSHARP_FILTER 1
@@ -2128,6 +2137,7 @@
 #define CONFIG_DAUD_DEMUXER 1
 #define CONFIG_DCSTR_DEMUXER 1
 #define CONFIG_DFA_DEMUXER 1
+#define CONFIG_DHAV_DEMUXER 1
 #define CONFIG_DIRAC_DEMUXER 1
 #define CONFIG_DNXHD_DEMUXER 1
 #define CONFIG_DSF_DEMUXER 1

--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -145,41 +145,49 @@
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>

--- a/SMP/ffplay.vcxproj
+++ b/SMP/ffplay.vcxproj
@@ -140,41 +140,49 @@
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>

--- a/SMP/ffprobe.vcxproj
+++ b/SMP/ffprobe.vcxproj
@@ -140,41 +140,49 @@
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -639,6 +639,9 @@
    <ClCompile Include="..\libavcodec\nvenc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\cuda_check.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\qsv.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2370,6 +2373,9 @@
    <ClCompile Include="..\libavcodec\pcm-dvd.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\pcm-dvdenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\adpcm.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2694,12 +2700,18 @@
    <ClCompile Include="..\libavcodec\null_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\prores_metadata_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\remove_extradata_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\trace_headers_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\truehd_core_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\vp9_metadata_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavcodec/bsf_list.c
+++ b/SMP/libavcodec/bsf_list.c
@@ -42,9 +42,11 @@ static const AVBitStreamFilter *bitstream_filters[] = {
    &ff_mov2textsub_bsf,
    &ff_noise_bsf,
    &ff_null_bsf,
+    &ff_prores_metadata_bsf,
    &ff_remove_extradata_bsf,
    &ff_text2movsub_bsf,
    &ff_trace_headers_bsf,
+    &ff_truehd_core_bsf,
    &ff_vp9_metadata_bsf,
    &ff_vp9_raw_reorder_bsf,
    &ff_vp9_superframe_bsf,

--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -124,6 +124,7 @@ static const AVCodec *codec_list[] = {
    &ff_wmav1_encoder,
    &ff_wmav2_encoder,
    &ff_pcm_alaw_encoder,
+    &ff_pcm_dvd_encoder,
    &ff_pcm_f32be_encoder,
    &ff_pcm_f32le_encoder,
    &ff_pcm_f64be_encoder,

--- a/SMP/libavdevice.vcxproj
+++ b/SMP/libavdevice.vcxproj
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -34,6 +34,9 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
+    <NASM Include="..\libavfilter\x86\scene_sad.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </NASM>
    <NASM Include="..\libavfilter\x86\af_afir.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </NASM>
@@ -489,6 +492,9 @@
    <ClCompile Include="..\libavfilter\vf_chromakey.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_chromashift.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_ciescope.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -555,6 +561,9 @@
    <ClCompile Include="..\libavfilter\vf_decimate.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_dedot.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_neighbor.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -648,6 +657,9 @@
    <ClCompile Include="..\libavfilter\vf_framestep.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_freezedetect.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_gblur.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -987,6 +999,9 @@
    <ClCompile Include="..\libavfilter\src_movie.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\scene_sad_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\x86\af_afir_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>
@@ -1068,6 +1083,9 @@
    <ClCompile Include="libavfilter\dce_defs.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\scene_sad.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\af_afir.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>

--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -141,6 +141,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_bwdif,
    &ff_vf_chromahold,
    &ff_vf_chromakey,
+    &ff_vf_chromashift,
    &ff_vf_ciescope,
    &ff_vf_codecview,
    &ff_vf_colorbalance,
@@ -163,6 +164,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_deblock,
    &ff_vf_decimate,
    &ff_vf_deconvolve,
+    &ff_vf_dedot,
    &ff_vf_deflate,
    &ff_vf_deflicker,
    &ff_vf_deinterlace_qsv,
@@ -199,6 +201,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_framepack,
    &ff_vf_framerate,
    &ff_vf_framestep,
+    &ff_vf_freezedetect,
    &ff_vf_fspp,
    &ff_vf_gblur,
    &ff_vf_geq,
@@ -280,6 +283,7 @@ static const AVFilter *filter_list[] = {
    &ff_vf_removelogo,
    &ff_vf_repeatfields,
    &ff_vf_reverse,
+    &ff_vf_rgbashift,
    &ff_vf_roberts,
    &ff_vf_rotate,
    &ff_vf_sab,

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -445,6 +445,9 @@
    <ClCompile Include="..\libavformat\dfa.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\dhav.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\diracdec.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>

--- a/SMP/libavformat/demuxer_list.c
+++ b/SMP/libavformat/demuxer_list.c
@@ -75,6 +75,7 @@ static const AVInputFormat *demuxer_list[] = {
    &ff_daud_demuxer,
    &ff_dcstr_demuxer,
    &ff_dfa_demuxer,
+    &ff_dhav_demuxer,
    &ff_dirac_demuxer,
    &ff_dnxhd_demuxer,
    &ff_dsf_demuxer,

--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -434,6 +434,7 @@ EXPORTS
    av_spherical_from_name
    av_spherical_projection_name
    av_spherical_tile_bounds
+    av_sscanf
    av_stereo3d_alloc
    av_stereo3d_create_side_data
    av_stereo3d_from_name

--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -78,6 +78,9 @@
    <ClCompile Include="..\libavutil\avstring.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavutil\avsscanf.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavutil\base64.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
@@ -252,6 +255,9 @@
    <ClCompile Include="..\libavutil\hwcontext_cuda.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavutil\cuda_check.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavutil\hwcontext_dxva2.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>

--- a/SMP/libpostproc.vcxproj
+++ b/SMP/libpostproc.vcxproj
--- a/SMP/libswresample.vcxproj
+++ b/SMP/libswresample.vcxproj
--- a/SMP/libswscale.vcxproj
+++ b/SMP/libswscale.vcxproj
--- a/SMP/unistd.h
+++ b/SMP/unistd.h
 /*
 * MSVC unistd.h compatibility header.
- * Copyright (c) 2015 Matthew Oliver
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal