Update ffmpeg and ffms2

build/Aegisub/standard-libraries.props

@@ -8,11 +8,12 @@
   <ItemDefinitionGroup>
     <Link>
       <AdditionalDependencies>
+        Usp10.lib;
         Vfw32.lib;
         advapi32.lib;
+        bcrypt.lib;
         comctl32.lib;
         comdlg32.lib;
-        Usp10.lib;
         gdi32.lib;
         kernel32.lib;
         ole32.lib;

build/ffmpeg/configure.sh

@@ -1,6 +1,6 @@
 platform='Win32'
 suffix='x86'
-if [[ $LIB =~ amd64 ]]; then
+if [[ $LIB =~ x64 ]]; then
   platform='x64'
   suffix='x64'
 fi
@@ -18,7 +18,6 @@ fi
   --disable-ffmpeg \
   --disable-ffplay \
   --disable-ffprobe \
-  --disable-ffserver \
   --disable-filters \
   --disable-hwaccels \
   --disable-muxers \
@@ -29,6 +28,9 @@ fi
   --enable-gpl \
   --enable-runtime-cpudetect \
   --enable-static \
+  --enable-small \
+  --enable-x86asm \
+  --x86asmexe=yasm \
   --enable-zlib \
   --extra-cflags=-D_SYSCRT \
   --extra-cflags=-I../../include \

build/ffmpeg/ffmpeg.vcxproj

@@ -22,6 +22,7 @@
       <AdditionalIncludeDirectories>
         $(MSBuildThisFileDirectory);
         $(FfmpegSrcDir);
+        $(FfmpegSrcDir)\compat\atomics\win32;
         $(AegisubSourceBase)\include;
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>
@@ -76,7 +77,6 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aac_ac3_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aac_adtstoasc_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aac_parser.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aacadtsdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aacdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aacdec_fixed.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aacps_fixed.c" />
@@ -100,12 +100,15 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\acelp_vectors.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\adpcm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\adpcm_data.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\adts_header.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\adts_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\adx.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\adx_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\adxdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aic.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\alac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\alac_data.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\alacdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aliaspixdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\allcodecs.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\alsdec.c" />
@@ -114,23 +117,31 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\anm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ansi.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\apedec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aptx.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ass.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ass_split.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\assdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\asv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\asvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac1.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\audioconvert.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3plus.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3plusdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac3plusdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\atrac9dec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\audio_frame_queue.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\audiodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\aura.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\av1_metadata_bsf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\av1_parse.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\av1_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avdct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avfft.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avpacket.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avpicture.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avrndec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avs.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avs2_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\avuidec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bethsoftvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bfi.c" />
@@ -139,14 +150,17 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\binkaudio.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\binkdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bintext.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitpacked.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitstream.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitstream_filter.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bitstream_filters.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\blockdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmp_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmvaudio.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bmvvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\brenderpix.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\bswapdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\c93.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cabac.c" />
@@ -156,54 +170,79 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cavsdata.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cavsdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cavsdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cbrt_data.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cbrt_data_fixed.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cbs.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cbs_av1.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cbs_h2645.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cbs_mpeg2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cbs_vp9.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ccaption_dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cdgraphics.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cdxl.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\celp_filters.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\celp_math.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cfhd.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cfhddata.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cga_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\chomp_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cinepak.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\clearvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cljrdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cllc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cngdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\codec2utils.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\codec_desc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cook.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cook_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cpia.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cscd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\cyuv.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\d3d11va.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dca.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dca_core.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dca_core_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dca_exss.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dca_lbr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dca_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dca_xll.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dcadata.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dcadct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dcadec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dcadsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dcahuff.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dct32_fixed.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dct32_float.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dds.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\decode.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dfa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dirac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dirac_arith.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dirac_dwt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dirac_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dirac_vlc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\diracdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\diracdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\diractab.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dnxhd_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dnxhddata.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dnxhddec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dolby_e.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dpcm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dpx.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dpx_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsddec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinaudio.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dsicinvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dss_sp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dstdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dump_extradata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dv_profile.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dvaudio_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dvaudiodec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dvbsub_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dvbsubdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dvd_nav_parser.c" />
@@ -213,6 +252,8 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dvdsubdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dxa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dxtory.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\dxv.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\eac3_core_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\eac3_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\eacmv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\eaidct.c" />
@@ -221,12 +262,15 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\eatgv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\eatqi.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\elsdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\encode.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\error_resilience.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\escape124.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\escape130.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\evrcdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\exif.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\exr.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\exrdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\extract_extradata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\faandct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\faanidct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\faxcompr.c" />
@@ -240,6 +284,9 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ffwavesynth.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fic.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\file_open.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\filter_units_bsf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fits.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fitsdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\flac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\flac_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\flacdata.c" />
@@ -249,6 +296,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\flicvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\flvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fmtconvert.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fmvc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\fraps.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\frwu.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g2meet.c" />
@@ -256,9 +304,12 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g722dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g722dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g723_1.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g723_1dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g726.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g729_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g729dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\g729postfilter.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\gdv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\gifdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\golomb.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\gsm_parser.c" />
@@ -273,27 +324,34 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h263data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h263dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h263dsp.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h2645_parse.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_cabac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_cavlc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_direct.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_levels.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_loopfilter.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_mb.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_metadata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_mp4toannexb_bsf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_parse.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_picture.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_ps.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_redundant_pps_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_refs.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_sei.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264_slice.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264chroma.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264data.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264idct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264pred.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h264qpel.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\h265_metadata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hap.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hapdec.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hapqa_extract_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevc_cabac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevc_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevc_filter.c" />
@@ -304,6 +362,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevc_ps.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevc_refs.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevc_sei.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevcdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevcdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hevcpred.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hnm4video.c" />
@@ -314,6 +373,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hqx.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hqxdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\hqxvlc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\htmlsubtitles.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\huffman.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\huffyuv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\huffyuvdec.c" />
@@ -321,11 +381,13 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\idcinvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\idctdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\iff.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ilbcdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imc.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imdct15.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imgconvert.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imm4.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\imx_dump_header_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\intelh263dec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\interplayacm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\interplayvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\intrax8.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\intrax8dsp.c" />
@@ -333,6 +395,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jacosubdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jfdctfst.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jfdctint.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jni.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\jpeg2000dsp.c" />
@@ -353,14 +416,19 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\lossless_audiodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\lossless_videodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\lsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\lzf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\lzw.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\m101.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mace.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\magicyuv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mathtables.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct15.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct_fixed.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct_fixed_32.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdct_float.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\me_cmp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mediacodec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\metasound.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\metasound_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\microdvddec.c" />
@@ -370,10 +438,12 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mjpega_dump_header_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mjpegbdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mjpegdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mjpegenc_huffman.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mlp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mlp_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mlpdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mlpdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mlz.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mmvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\motion_est.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\motionpixels.c" />
@@ -386,6 +456,8 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg12.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg12data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg12dec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg12framerate.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg2_metadata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4_unpack_bframes_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4audio.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpeg4video.c" />
@@ -414,6 +486,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mpl2dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mqc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mqcdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mscc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\msgsmdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\msmpeg4.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\msmpeg4data.c" />
@@ -429,10 +502,12 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mss4.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\msvideo1.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mvcdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mwsc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\mxpegdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\nellymoser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\nellymoserdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\noise_bsf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\null_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\nuv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\on2avc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\on2avcdata.c" />
@@ -440,11 +515,15 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_celt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_pvq.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_rc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opus_silk.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opusdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\opustab.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pafaudio.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pafvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\parsers.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm-bluray.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm-dvd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pcm.c" />
@@ -452,6 +531,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pgssubdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pictordec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pixblockdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pixlet.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\png.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\png_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pngdec.c" />
@@ -459,16 +539,20 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pnm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pnm_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pnmdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\profiles.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\prores_metadata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\proresdata.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\proresdec2.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\proresdec_lgpl.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\proresdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\prosumer.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\psd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pthread.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pthread_frame.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\pthread_slice.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ptx.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\qcelpdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\qdm2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\qdmc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\qdrw.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\qpeg.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\qpeldsp.c" />
@@ -480,19 +564,19 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ra288.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ralf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rangecoder.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rasc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ratecontrol.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\raw.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rawdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rdft.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\realtextdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\remove_extradata_bsf.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\resample.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\resample2.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rl.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rl2.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\roqvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\roqvideodec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rpza.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rscc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rtjpeg.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rv10.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\rv30.c" />
@@ -505,16 +589,24 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\s302m.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\samidec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sanm.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sbc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sbc_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sbcdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sbcdec_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sbrdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sbrdsp_fixed.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\scpr.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\screenpresso.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sgidec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sgirledec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sheervideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\shorten.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\simple_idct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sinewin.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sinewin_fixed.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sipr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sipr16k.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sipr_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\smacker.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\smc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\smvjpegdec.c" />
@@ -524,6 +616,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\snowdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sonic.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\sp5xdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\speedhq.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\srtdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\startcode.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\subviewerdec.c" />
@@ -536,6 +629,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tak.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tak_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\takdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\takdsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\targa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\targa_y216dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tdsc.c" />
@@ -547,8 +641,10 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tiff_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tmv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tpeldsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\trace_headers_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\truemotion1.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\truemotion2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\truemotion2rt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\truespeech.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tscc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\tscc2.c" />
@@ -561,6 +657,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\utils.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\utvideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\utvideodec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\utvideodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\v210dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\v210x.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\v308dec.c" />
@@ -602,13 +699,24 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp8_parser.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp8dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9_metadata_bsf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9_raw_reorder_bsf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9_superframe_bsf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9_superframe_split_bsf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9block.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9dsp_10bpp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9dsp_12bpp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9dsp_8bpp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9lpf.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9mvs.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9prob.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vp9recon.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\vqavideo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wavpack.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wcmv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\webp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\webvttdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wma.c" />
@@ -619,11 +727,15 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmaprodec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmavoice.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmv2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmv2data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmv2dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wmv2dsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wnv1.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\wrapped_avframe.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ws-snd1.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\aacpsdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\ac3dsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\alacdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\audiodsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\blockdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\bswapdsp_init.c" />
@@ -631,8 +743,9 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\constants.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dcadsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dct_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dirac_dwt.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\dirac_dwt_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp_mmx.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\exrdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fdct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fdctdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\fft_init.c" />
@@ -646,11 +759,13 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\h264dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\hevcdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp_vp3_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\jpeg2000dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_audiodsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_videodsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mdct15_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\me_cmp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegaudiodsp.c" />
@@ -658,6 +773,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideodsp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideoenc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideoencdsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\opus_dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\pixblockdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\pngdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\proresdsp_init.c" />
@@ -665,9 +781,11 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\rv34dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\rv40dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\sbrdsp_init.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\simple_idct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\snowdsp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\synth_filter_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\takdsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\ttadsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\utvideodsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\v210-init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vc1dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vc1dsp_mmx.c" />
@@ -677,6 +795,9 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp6dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp8dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp9dsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp9dsp_init_10bpp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp9dsp_init_12bpp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\vp9dsp_init_16bpp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xan.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xbmdec.c" />
@@ -684,11 +805,14 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xfacedec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xiph.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xl.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xma_parser.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xpmdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xsubdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xvididct.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xwddec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\xxan.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\y41pdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavcodec\ylc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\yop.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\yuv4dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavcodec\zerocodec.c" />
@@ -697,15 +821,20 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavdevice\avdevice.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavdevice\file_open.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavdevice\utils.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\3dostr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\4xm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\aacdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\aadec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\ac3dec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\acm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\act.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\adp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\ads.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\adxdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\aea.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\afc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\aiffdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\aixdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\allformats.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\amr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\anm.c" />
@@ -713,6 +842,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\ape.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\apetag.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\apngdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\aptxdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\aqtitledec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\asf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\asfcrypt.c" />
@@ -721,6 +851,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\assdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\ast.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\astdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\async.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\au.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\avidec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\avio.c" />
@@ -744,12 +875,15 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\cdg.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\cdxl.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\cinedec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\codec2.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\concat.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\concatdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\crypto.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\cutils.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\data_uri.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dauddec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\davs2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dcstr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dfa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\diracdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dnxhddec.c" />
@@ -761,24 +895,29 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dump.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dvbsub.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\dvbtxt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\dxa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\eacdata.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\electronicarts.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\epafdec.c" />
-    <ClCompile Include="$(FfmpegSrcDir)\libavformat\ffmdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\ffmetadec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\file.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\file_open.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\filmstripdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\fitsdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\flac_picture.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\flacdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\flic.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\flvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\format.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\frmdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\fsb.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\g722.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\g723_1.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\g726.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\g729dec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\gdv.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\genh.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\gifdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\gsmdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\gxf.c" />
@@ -823,11 +962,14 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\metadata.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mgsts.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\microdvddec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\mj2kdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\mlpdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mlvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mm.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mmf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mov.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mov_chan.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\mov_esds.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mp3dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mpc.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mpc8.c" />
@@ -837,8 +979,11 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mpjpegdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mpl2dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mpsubdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\msf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\msnwc_tcp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\mtaf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mtv.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\musx.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mux.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mvi.c" />
@@ -847,12 +992,14 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\mxg.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\ncdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\nistspheredec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\nspdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\nsvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\nut.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\nutdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\nuv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\oggdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\oggparsecelt.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\oggparsedaala.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\oggparsedirac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\oggparseflac.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\oggparseogm.c" />
@@ -871,10 +1018,13 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\pcmdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\pjsdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\pmpdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\prompeg.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\protocols.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\psxstr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\pva.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\pvfdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\qcp.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\qtpalette.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\r3d.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rawdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rawvideodec.c" />
@@ -891,12 +1041,19 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rsd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rso.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\rsodec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\s337m.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\samidec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\sauce.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\sbcdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\sbgdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\sccdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\sdp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\sdr2.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\sdsdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\sdxdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\segafilm.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\serdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\shortendec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\sierravmd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\siff.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\smacker.c" />
@@ -914,23 +1071,32 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\subviewer1dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\subviewerdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\supdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\svag.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\swf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\swfdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\takdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\tedcaptionsdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\tee_common.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\teeproto.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\thp.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\tiertexseq.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\tmv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\tta.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\tty.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\txd.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\ty.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\url.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\utils.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\v210.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\vag.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\vc1dec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\vc1test.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\vivo.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\voc.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\voc_packet.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\vocdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\vorbiscomment.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\vpk.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\vplayerdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\vqf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\w64.c" />
@@ -939,18 +1105,23 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\webvttdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\westwood_aud.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\westwood_vqa.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\wsddec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\wtv_common.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\wtvdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\wv.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\wvdec.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\wvedec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\xa.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\xmv.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavformat\xvag.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\xwma.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\yop.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavformat\yuv4mpegdec.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\adler32.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\aes.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\aes_ctr.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\audio_fifo.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\avsscanf.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\avstring.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\base64.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\blowfish.c" />
@@ -966,6 +1137,7 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\dict.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\display.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\downmix_info.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\encryption_info.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\error.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\eval.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\fifo.c" />
@@ -976,13 +1148,16 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\frame.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\hash.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\hmac.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\hwcontext.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\imgutils.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\integer.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\intmath.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\lfg.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\lls.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\log.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\log2_tab.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\lzo.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\mastering_display_metadata.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\mathematics.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\md5.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\mem.c" />
@@ -994,10 +1169,13 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\random_seed.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\rational.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\rc4.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\reverse.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\ripemd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\samplefmt.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\sha.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\sha512.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\slicethread.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\spherical.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\stereo3d.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\tea.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\threadmessage.c" />
@@ -1007,7 +1185,9 @@
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\twofish.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\utils.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\cpu.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\fixed_dsp_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\float_dsp_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\imgutils_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\x86\lls_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\xga_font_data.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libavutil\xtea.c" />
@@ -1022,21 +1202,25 @@
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\audio_convert_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\rematrix_init.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswresample\x86\resample_init.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\alphablend.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\gamma.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\hscale.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\hscale_fast_bilinear.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\input.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\options.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\output.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\rgb2rgb.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\slice.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\swscale.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\swscale_unscaled.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\utils.c" />
+    <ClCompile Include="$(FfmpegSrcDir)\libswscale\vscale.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\hscale_fast_bilinear_simd.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\rgb2rgb.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\swscale.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\x86\yuv2rgb.c" />
     <ClCompile Include="$(FfmpegSrcDir)\libswscale\yuv2rgb.c" />
   </ItemGroup>
-
   <ItemGroup>
     <InstallHeader Include="$(MSBuildThisFileDirectory)\libavutil\avconfig.h">
       <HeaderRoot>$(MSBuildThisFileDirectory)</HeaderRoot>
@@ -1050,10 +1234,8 @@
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\d3d11va.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\dv_profile.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\dxva2.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\old_codec_ids.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\qsv.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vaapi.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vda.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vdpau.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\version.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavcodec\vorbis_parser.h" />
@@ -1069,7 +1251,6 @@
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\aes.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\attributes.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\audio_fifo.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\audioconvert.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\avassert.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\avstring.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\avutil.h" />
@@ -1094,6 +1275,7 @@
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\frame.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\hash.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\hmac.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\hwcontext.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\imgutils.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intfloat.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\intreadwrite.h" />
@@ -1101,12 +1283,12 @@
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\log.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\lzo.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\macros.h" />
+    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\mastering_display_metadata.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\mathematics.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\md5.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\mem.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\motion_vector.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\murmur3.h" />
-    <InstallHeader Include="$(FfmpegSrcDir)\libavutil\old_pix_fmts.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\opt.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\parseutils.h" />
     <InstallHeader Include="$(FfmpegSrcDir)\libavutil\pixdesc.h" />
@@ -1135,15 +1317,19 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\aacpsdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\ac3dsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\ac3dsp_downmix.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\alacdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\audiodsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\blockdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\bswapdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\cavsidct.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dcadsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dct32.asm" />
-    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\deinterlace.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dirac_dwt.asm" />
-    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp_yasm.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\diracdsp.asm" />
-    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\dwt_yasm.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\exrdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fft.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\flacdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\fmtconvert.asm" />
@@ -1162,18 +1348,21 @@
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\h264_qpel_8bit.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\h264_weight.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\h264_weight_10bit.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_add_res.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_deblock.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_idct.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_mc.asm" />
-    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_res_add.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_sao.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hevc_sao_10bit.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\hpeldsp_vp3.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\huffyuvdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\idctdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\imdct36.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\jpeg2000dsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_audiodsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\lossless_videodsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\mdct15.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\me_cmp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\mlpdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\mpegvideoencdsp.asm" />
@@ -1185,9 +1374,15 @@
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\rv34dsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\rv40dsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\sbrdsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\simple_idct.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\simple_idct10.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\synth_filter.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\takdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\ttadsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\utvideodsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\v210.asm" />
-    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vc1dsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vc1dsp_loopfilter.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vc1dsp_mc.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\videodsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vorbisdsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp3dsp.asm" />
@@ -1195,19 +1390,26 @@
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp8dsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp8dsp_loopfilter.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9intrapred.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9intrapred_16bpp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9itxfm.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9itxfm_16bpp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9lpf.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9lpf_16bpp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9mc.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\vp9mc_16bpp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavcodec\x86\xvididct.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\cpuid.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\emms.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\fixed_dsp.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\float_dsp.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\imgutils.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libavutil\x86\lls.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\audio_convert.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\rematrix.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswresample\x86\resample.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswscale\x86\input.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswscale\x86\output.asm" />
+    <Yasm Include="$(FfmpegSrcDir)\libswscale\x86\rgb_2_rgb.asm" />
     <Yasm Include="$(FfmpegSrcDir)\libswscale\x86\scale.asm" />
   </ItemGroup>
 </Project>

build/ffms2/ffms2.vcxproj

@@ -60,14 +60,10 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\ffms.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\filehandle.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\indexing.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\lavfaudio.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\lavfindexer.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\lavfvideo.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\track.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\videosource.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\videoutils.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\wave64writer.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\zipfile.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -84,7 +80,6 @@
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\videosource.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\videoutils.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\wave64writer.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\zipfile.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\VapourSynth.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\vapoursource.h" />

build/ffms2/ffms2.vcxproj.filters

@@ -27,18 +27,9 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\audiosource.cpp">
       <Filter>Audio</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\lavfaudio.cpp">
-      <Filter>Audio</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\indexing.cpp">
       <Filter>Indexing</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\lavfindexer.cpp">
-      <Filter>Indexing</Filter>
-    </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\lavfvideo.cpp">
-      <Filter>Video</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\videosource.cpp">
       <Filter>Video</Filter>
     </ClCompile>
@@ -48,9 +39,6 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\wave64writer.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <None Include="$(FfmsSrcDir)\src\avisynth\avisynth.cpp">
       <Filter>Avisynth</Filter>
     </None>
@@ -104,9 +92,6 @@
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\wave64writer.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="$(FfmsSrcDir)\src\avisynth\avisynth.h">
       <Filter>Avisynth</Filter>
     </ClInclude>

src/video_provider_ffmpegsource.cpp

@@ -44,6 +44,23 @@
 #include <libaegisub/make_unique.h>
 
 namespace {
+typedef enum AGI_ColorSpaces {
+	AGI_CS_RGB = 0,
+	AGI_CS_BT709 = 1,
+	AGI_CS_UNSPECIFIED = 2,
+	AGI_CS_FCC = 4,
+	AGI_CS_BT470BG = 5,
+	AGI_CS_SMPTE170M = 6,
+	AGI_CS_SMPTE240M = 7,
+	AGI_CS_YCOCG = 8,
+	AGI_CS_BT2020_NCL = 9,
+	AGI_CS_BT2020_CL = 10,
+	AGI_CS_SMPTE2085 = 11,
+	AGI_CS_CHROMATICITY_DERIVED_NCL = 12,
+	AGI_CS_CHROMATICITY_DERIVED_CL = 13,
+	AGI_CS_ICTCP = 14
+} AGI_ColorSpaces;
+
 /// @class FFmpegSourceVideoProvider
 /// @brief Implements video loading through the FFMS library.
 class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider {
@@ -78,7 +95,7 @@ public:
 		if (matrix == RealColorSpace)
 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
 		else if (matrix == "TV.601")
-			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
+			FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
 		else
 			return;
 		ColorSpace = matrix;
@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) {
 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
 
 	switch (cs) {
-		case FFMS_CS_RGB:
+		case AGI_CS_RGB:
 			return "None";
-		case FFMS_CS_BT709:
+		case AGI_CS_BT709:
 			return str + ".709";
-		case FFMS_CS_FCC:
+		case AGI_CS_FCC:
 			return str + ".FCC";
-		case FFMS_CS_BT470BG:
+		case AGI_CS_BT470BG:
-		case FFMS_CS_SMPTE170M:
+		case AGI_CS_SMPTE170M:
 			return str + ".601";
-		case FFMS_CS_SMPTE240M:
+		case AGI_CS_SMPTE240M:
 			return str + ".240M";
 		default:
 			throw VideoOpenError("Unknown video color space");
@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
 
 	// set thread count
 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
+#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0)
 	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
 		Threads = 1;
+#endif
 
 	// set seekmode
 	// TODO: give this its own option?
@@ -238,14 +257,14 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
 	int VideoCS = CS = TempFrame->ColorSpace;
 	CR = TempFrame->ColorRange;
 
-	if (CS == FFMS_CS_UNSPECIFIED)
+	if (CS == AGI_CS_UNSPECIFIED)
-		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
+		CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG;
 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
 
 #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
-	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
+	if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-		CS = FFMS_CS_BT470BG;
+		CS = AGI_CS_BT470BG;
-		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
+		ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR);
 	}
 
 	if (CS != VideoCS) {

vendor/ffmpeg

@@ -1 +1 @@
-Subproject commit 802e51299e6d018f2f54c8d14f2b765c7c750496
+Subproject commit d290bb0c540425e937d11ed88e22c68ab97c57eb

vendor/ffms2

@@ -1 +1 @@
-Subproject commit 06bcf231cab00bfbf28f910c6ec3ca6680957cb6
+Subproject commit f3c6b008b53719dcac032293e3a42a3164c8d7ec