projects: Update for recent upstream merge.

d0f5651c · Matt Oliver · 4a8e5573 · d0f5651c · d0f5651c · d0f5651c
18 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -412,6 +412,7 @@
 %define HAVE_SECTION_DATA_REL_RO 0
 %define HAVE_TEXI2HTML 0
 %define HAVE_THREADS 1
+%define HAVE_VAAPI_DRM 0
 %define HAVE_VAAPI_X11 0
 %define HAVE_VDPAU_X11 0
 %define HAVE_WINRT 0
@@ -453,7 +454,6 @@
 %define CONFIG_BZLIB 1
 %define CONFIG_CHROMAPRINT 0
 %define CONFIG_CRYSTALHD 0
-%define CONFIG_CUDA 0
 %define CONFIG_DECKLINK 0
 %define CONFIG_FREI0R 0
 %define CONFIG_GCRYPT 0
@@ -469,6 +469,7 @@
 %define CONFIG_LIBCDIO 1
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBDC1394 0
+%define CONFIG_LIBEBUR128 0
 %define CONFIG_LIBFAAC 0
 %define CONFIG_LIBFDK_AAC 1
 %define CONFIG_LIBFLITE 0
@@ -480,7 +481,6 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 1
 %define CONFIG_LIBKVAZAAR 0
-%define CONFIG_LIBMFX 1
 %define CONFIG_LIBMODPLUG 1
 %define CONFIG_LIBMP3LAME 1
 %define CONFIG_LIBNUT 0
@@ -525,9 +525,7 @@
 %define CONFIG_LIBZVBI 0
 %define CONFIG_LZMA 1
 %define CONFIG_MEDIACODEC 0
-%define CONFIG_MMAL 0
 %define CONFIG_NETCDF 0
-%define CONFIG_NVENC 1
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 1
@@ -542,12 +540,18 @@
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
+%define CONFIG_OMX_RPI 0
 %define CONFIG_RUNTIME_CPUDETECT 1
 %define CONFIG_SAFE_BITSTREAM_READER 1
 %define CONFIG_SHARED 1
 %define CONFIG_SMALL 0
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
+%define CONFIG_CUDA 0
+%define CONFIG_LIBMFX 1
+%define CONFIG_MMAL 0
+%define CONFIG_NVENC 1
+%define CONFIG_OMX 0
 %define CONFIG_D3D11VA 1
 %define CONFIG_DXVA2 1
 %define CONFIG_VAAPI 0
@@ -660,6 +664,7 @@
 %define CONFIG_TEXTUREDSP 1
 %define CONFIG_TEXTUREDSPENC 1
 %define CONFIG_TPELDSP 1
+%define CONFIG_VAAPI_ENCODE 0
 %define CONFIG_VC1DSP 1
 %define CONFIG_VIDEODSP 1
 %define CONFIG_VP3DSP 1
@@ -945,6 +950,7 @@
 %define CONFIG_DSD_MSBF_PLANAR_DECODER 1
 %define CONFIG_DSICINAUDIO_DECODER 1
 %define CONFIG_DSS_SP_DECODER 1
+%define CONFIG_DST_DECODER 1
 %define CONFIG_EAC3_DECODER 1
 %define CONFIG_EVRC_DECODER 1
 %define CONFIG_FFWAVESYNTH_DECODER 1
@@ -1065,6 +1071,7 @@
 %define CONFIG_ADPCM_IMA_WAV_DECODER 1
 %define CONFIG_ADPCM_IMA_WS_DECODER 1
 %define CONFIG_ADPCM_MS_DECODER 1
+%define CONFIG_ADPCM_MTAF_DECODER 1
 %define CONFIG_ADPCM_PSX_DECODER 1
 %define CONFIG_ADPCM_SBPRO_2_DECODER 1
 %define CONFIG_ADPCM_SBPRO_3_DECODER 1
@@ -1262,6 +1269,7 @@
 %define CONFIG_MPSUB_DEMUXER 1
 %define CONFIG_MSF_DEMUXER 1
 %define CONFIG_MSNWC_TCP_DEMUXER 1
+%define CONFIG_MTAF_DEMUXER 1
 %define CONFIG_MTV_DEMUXER 1
 %define CONFIG_MUSX_DEMUXER 1
 %define CONFIG_MV_DEMUXER 1
@@ -1571,12 +1579,16 @@
 %define CONFIG_LIBXVID_ENCODER 1
 %define CONFIG_LIBOPENH264_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
+%define CONFIG_H264_VAAPI_ENCODER 0
 %define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 1
+%define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_NVENC_H264_ENCODER 1
 %define CONFIG_NVENC_HEVC_ENCODER 1
 %define CONFIG_HEVC_QSV_ENCODER 1
+%define CONFIG_HEVC_VAAPI_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
+%define CONFIG_MJPEG_VAAPI_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 1
 %define CONFIG_ABENCH_FILTER 1
 %define CONFIG_ACOMPRESSOR_FILTER 1
@@ -1641,6 +1653,7 @@
 %define CONFIG_HIGHPASS_FILTER 1
 %define CONFIG_JOIN_FILTER 1
 %define CONFIG_LADSPA_FILTER 0
+%define CONFIG_LOUDNORM_FILTER 0
 %define CONFIG_LOWPASS_FILTER 1
 %define CONFIG_PAN_FILTER 1
 %define CONFIG_REPLAYGAIN_FILTER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -454,6 +454,7 @@
 #define HAVE_SECTION_DATA_REL_RO 0
 #define HAVE_TEXI2HTML 0
 #define HAVE_THREADS 1
+#define HAVE_VAAPI_DRM 0
 #define HAVE_VAAPI_X11 0
 #define HAVE_VDPAU_X11 0
 #define HAVE_WINRT 0
@@ -495,7 +496,6 @@
 #define CONFIG_BZLIB 1
 #define CONFIG_CHROMAPRINT 0
 #define CONFIG_CRYSTALHD 0
-#define CONFIG_CUDA 0
 #define CONFIG_DECKLINK 0
 #define CONFIG_FREI0R 0
 #define CONFIG_GCRYPT 0
@@ -511,6 +511,7 @@
 #define CONFIG_LIBCDIO 1
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
+#define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 1
 #define CONFIG_LIBFLITE 0
@@ -522,7 +523,6 @@
 #define CONFIG_LIBIEC61883 0
 #define CONFIG_LIBILBC 1
 #define CONFIG_LIBKVAZAAR 0
-#define CONFIG_LIBMFX 1
 #define CONFIG_LIBMODPLUG 1
 #define CONFIG_LIBMP3LAME 1
 #define CONFIG_LIBNUT 0
@@ -567,9 +567,7 @@
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 1
 #define CONFIG_MEDIACODEC 0
-#define CONFIG_MMAL 0
 #define CONFIG_NETCDF 0
-#define CONFIG_NVENC 1
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 1
@@ -584,6 +582,7 @@
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_OMX_RPI 0
 #define CONFIG_RUNTIME_CPUDETECT 1
 #define CONFIG_SAFE_BITSTREAM_READER 1
 #if defined(_USRDLL) || defined(_WINDLL)
@@ -598,6 +597,11 @@
 #   define CONFIG_STATIC 1
 #endif
 #define CONFIG_SWSCALE_ALPHA 1
+#define CONFIG_CUDA 0
+#define CONFIG_LIBMFX 1
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 1
+#define CONFIG_OMX 0
 #define CONFIG_D3D11VA 1
 #define CONFIG_DXVA2 1
 #define CONFIG_VAAPI 0
@@ -710,6 +714,7 @@
 #define CONFIG_TEXTUREDSP 1
 #define CONFIG_TEXTUREDSPENC 1
 #define CONFIG_TPELDSP 1
+#define CONFIG_VAAPI_ENCODE 0
 #define CONFIG_VC1DSP 1
 #define CONFIG_VIDEODSP 1
 #define CONFIG_VP3DSP 1
@@ -995,6 +1000,7 @@
 #define CONFIG_DSD_MSBF_PLANAR_DECODER 1
 #define CONFIG_DSICINAUDIO_DECODER 1
 #define CONFIG_DSS_SP_DECODER 1
+#define CONFIG_DST_DECODER 1
 #define CONFIG_EAC3_DECODER 1
 #define CONFIG_EVRC_DECODER 1
 #define CONFIG_FFWAVESYNTH_DECODER 1
@@ -1115,6 +1121,7 @@
 #define CONFIG_ADPCM_IMA_WAV_DECODER 1
 #define CONFIG_ADPCM_IMA_WS_DECODER 1
 #define CONFIG_ADPCM_MS_DECODER 1
+#define CONFIG_ADPCM_MTAF_DECODER 1
 #define CONFIG_ADPCM_PSX_DECODER 1
 #define CONFIG_ADPCM_SBPRO_2_DECODER 1
 #define CONFIG_ADPCM_SBPRO_3_DECODER 1
@@ -1312,6 +1319,7 @@
 #define CONFIG_MPSUB_DEMUXER 1
 #define CONFIG_MSF_DEMUXER 1
 #define CONFIG_MSNWC_TCP_DEMUXER 1
+#define CONFIG_MTAF_DEMUXER 1
 #define CONFIG_MTV_DEMUXER 1
 #define CONFIG_MUSX_DEMUXER 1
 #define CONFIG_MV_DEMUXER 1
@@ -1621,12 +1629,16 @@
 #define CONFIG_LIBXVID_ENCODER 1
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
+#define CONFIG_H264_VAAPI_ENCODER 0
 #define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 1
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 1
 #define CONFIG_NVENC_HEVC_ENCODER 1
 #define CONFIG_HEVC_QSV_ENCODER 1
+#define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
+#define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 1
 #define CONFIG_ABENCH_FILTER 1
 #define CONFIG_ACOMPRESSOR_FILTER 1
@@ -1691,6 +1703,7 @@
 #define CONFIG_HIGHPASS_FILTER 1
 #define CONFIG_JOIN_FILTER 1
 #define CONFIG_LADSPA_FILTER 0
+#define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 1
 #define CONFIG_PAN_FILTER 1
 #define CONFIG_REPLAYGAIN_FILTER 1

--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -38,8 +38,8 @@
    <ClCompile Include="..\cmdutils.c" />
    <ClCompile Include="..\ffmpeg_opt.c" />
    <ClCompile Include="..\ffmpeg_filter.c" />
-    <ClCompile Include="..\ffmpeg_dxva2.c" />
    <ClCompile Include="..\ffmpeg_qsv.c" />
+    <ClCompile Include="..\ffmpeg_dxva2.c" />
    <ClCompile Include="..\ffmpeg.c" />
  </ItemGroup>
  <PropertyGroup Label="Globals">

--- a/SMP/ffmpeg.vcxproj.filters
+++ b/SMP/ffmpeg.vcxproj.filters
@@ -24,10 +24,10 @@
    <ClCompile Include="..\ffmpeg_filter.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\ffmpeg_dxva2.c">
+    <ClCompile Include="..\ffmpeg_qsv.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\ffmpeg_qsv.c">
+    <ClCompile Include="..\ffmpeg_dxva2.c">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\ffmpeg.c">

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -576,24 +576,12 @@
    <ClCompile Include="..\libavcodec\mss34dsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvenc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\pixblockdsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\qpeldsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsv.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvdec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\rangecoder.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -987,15 +975,15 @@
    <ClCompile Include="..\libavcodec\canopus.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\cook.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\cngdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\cngenc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\cook.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\cpia.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1023,6 +1011,9 @@
    <ClCompile Include="..\libavcodec\dca_xll.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\dca_lbr.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\dcadsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1074,6 +1065,9 @@
    <ClCompile Include="..\libavcodec\dsddec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\dsd.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\dsicinaudio.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1083,6 +1077,9 @@
    <ClCompile Include="..\libavcodec\dss_sp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\dstdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\dvbsubdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1341,10 +1338,7 @@
    <ClCompile Include="..\libavcodec\h264_parse.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvdec_h2645.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc_h264.c">
+    <ClCompile Include="..\libavcodec\h2645_parse.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\hapdec.c">
@@ -1380,18 +1374,9 @@
    <ClCompile Include="..\libavcodec\hevc_filter.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\h2645_parse.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\hevc_data.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc_hevc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\hevc_ps_enc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\hnm4video.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1587,18 +1572,15 @@
    <ClCompile Include="..\libavcodec\mpeg12enc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvdec_mpeg2.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\xvididct.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\mpl2dec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\mss3.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\msmpeg4dec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1614,9 +1596,6 @@
    <ClCompile Include="..\libavcodec\msrle.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\mss3.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\mss1.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2013,6 +1992,9 @@
    <ClCompile Include="..\libavcodec\v210enc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\v210x.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\v308dec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2025,9 +2007,6 @@
    <ClCompile Include="..\libavcodec\v410enc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\v210x.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\vb.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2178,10 +2157,10 @@
    <ClCompile Include="..\libavcodec\wnv1.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\ws-snd1.c">
+    <ClCompile Include="..\libavcodec\wrapped_avframe.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\wrapped_avframe.c">
+    <ClCompile Include="..\libavcodec\ws-snd1.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\xan.c">
@@ -2307,6 +2286,36 @@
    <ClCompile Include="..\libavcodec\dxva2_vc1.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\nvenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsv.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec_h2645.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvenc_h264.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvenc_hevc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\hevc_ps_enc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec_mpeg2.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\libfdk-aacdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2355,13 +2364,13 @@
    <ClCompile Include="..\libavcodec\libxvid.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\aac_parser.c">
+    <ClCompile Include="..\libavcodec\latm_parser.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\aac_ac3_parser.c">
+    <ClCompile Include="..\libavcodec\aac_parser.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\latm_parser.c">
+    <ClCompile Include="..\libavcodec\aac_ac3_parser.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\ac3_parser.c">
@@ -2750,15 +2759,15 @@
    <ClInclude Include="..\libavcodec\avfft.h">
      <Filter>Header Files\libavcodec</Filter>
    </ClInclude>
-    <ClInclude Include="..\libavcodec\dv_profile.h">
-      <Filter>Header Files\libavcodec</Filter>
-    </ClInclude>
    <ClInclude Include="..\libavcodec\d3d11va.h">
      <Filter>Header Files\libavcodec</Filter>
    </ClInclude>
    <ClInclude Include="..\libavcodec\dirac.h">
      <Filter>Header Files\libavcodec</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavcodec\dv_profile.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavcodec\dxva2.h">
      <Filter>Header Files\libavcodec</Filter>
    </ClInclude>

--- a/SMP/libavcodec/bsf_list.c
+++ b/SMP/libavcodec/bsf_list.c
+static const AVBitStreamFilter *bitstream_filters[] = {
+    &ff_aac_adtstoasc_bsf,
+    &ff_chomp_bsf,
+    &ff_dump_extradata_bsf,
+    &ff_dca_core_bsf,
+    &ff_h264_mp4toannexb_bsf,
+    &ff_hevc_mp4toannexb_bsf,
+    &ff_imx_dump_header_bsf,
+    &ff_mjpeg2jpeg_bsf,
+    &ff_mjpega_dump_header_bsf,
+    &ff_mp3_header_decompress_bsf,
+    &ff_mpeg4_unpack_bframes_bsf,
+    &ff_mov2textsub_bsf,
+    &ff_noise_bsf,
+    &ff_remove_extradata_bsf,
+    &ff_text2movsub_bsf,
+    &ff_vp9_superframe_bsf,
+    NULL };
\ No newline at end of file
--- a/SMP/libavdevice.vcxproj
+++ b/SMP/libavdevice.vcxproj
@@ -72,6 +72,7 @@
    <ClCompile Include="..\libavdevice\alldevices.c" />
    <ClCompile Include="..\libavdevice\avdevice.c" />
    <ClCompile Include="..\libavdevice\utils.c" />
+    <ClCompile Include="..\libavdevice\file_open.c" />
    <ClCompile Include="..\libavdevice\dshow_crossbar.c" />
    <ClCompile Include="..\libavdevice\dshow.c" />
    <ClCompile Include="..\libavdevice\dshow_enummediatypes.c" />
@@ -85,7 +86,6 @@
    <ClCompile Include="..\libavdevice\sdl.c" />
    <ClCompile Include="..\libavdevice\vfwcap.c" />
    <ClCompile Include="..\libavdevice\libcdio.c" />
-    <ClCompile Include="..\libavdevice\file_open.c" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\libavdevice\avdevice.h" />

--- a/SMP/libavdevice.vcxproj.filters
+++ b/SMP/libavdevice.vcxproj.filters
@@ -37,6 +37,9 @@
    <ClCompile Include="..\libavdevice\utils.c">
      <Filter>Source Files\libavdevice</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavdevice\file_open.c">
+      <Filter>Source Files\libavdevice</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavdevice\dshow_crossbar.c">
      <Filter>Source Files\libavdevice</Filter>
    </ClCompile>
@@ -76,9 +79,6 @@
    <ClCompile Include="..\libavdevice\libcdio.c">
      <Filter>Source Files\libavdevice</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavdevice\file_open.c">
-      <Filter>Source Files\libavdevice</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\libavdevice\avdevice.h">

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -106,6 +106,7 @@
    <ClCompile Include="..\libavfilter\opencl_allkernels.c" />
    <ClCompile Include="..\libavfilter\transform.c" />
    <ClCompile Include="..\libavfilter\video.c" />
+    <ClCompile Include="..\libavfilter\pthread.c" />
    <ClCompile Include="..\libavfilter\f_bench.c" />
    <ClCompile Include="..\libavfilter\af_sidechaincompress.c" />
    <ClCompile Include="..\libavfilter\af_afade.c" />
@@ -173,9 +174,9 @@
    <ClCompile Include="..\libavfilter\af_volumedetect.c" />
    <ClCompile Include="..\libavfilter\af_hdcd.c" />
    <ClCompile Include="..\libavfilter\asrc_anoisesrc.c" />
-    <ClCompile Include="..\libavfilter\asrc_anullsrc.c" />
    <ClCompile Include="..\libavfilter\asrc_sine.c" />
    <ClCompile Include="..\libavfilter\asink_anullsink.c" />
+    <ClCompile Include="..\libavfilter\asrc_anullsrc.c" />
    <ClCompile Include="..\libavfilter\vf_subtitles.c" />
    <ClCompile Include="..\libavfilter\vf_extractplanes.c" />
    <ClCompile Include="..\libavfilter\vf_alphamerge.c" />
@@ -350,10 +351,10 @@
    <ClCompile Include="..\libavfilter\vf_zoompan.c" />
    <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />
    <ClCompile Include="..\libavfilter\vsrc_cellauto.c" />
+    <ClCompile Include="..\libavfilter\vsink_nullsink.c" />
    <ClCompile Include="..\libavfilter\vsrc_life.c" />
    <ClCompile Include="..\libavfilter\vsrc_mandelbrot.c" />
    <ClCompile Include="..\libavfilter\vsrc_mptestsrc.c" />
-    <ClCompile Include="..\libavfilter\vsink_nullsink.c" />
    <ClCompile Include="..\libavfilter\avf_ahistogram.c" />
    <ClCompile Include="..\libavfilter\avf_aphasemeter.c" />
    <ClCompile Include="..\libavfilter\avf_avectorscope.c" />
@@ -365,7 +366,6 @@
    <ClCompile Include="..\libavfilter\avf_showwaves.c" />
    <ClCompile Include="..\libavfilter\vaf_spectrumsynth.c" />
    <ClCompile Include="..\libavfilter\src_movie.c" />
-    <ClCompile Include="..\libavfilter\pthread.c" />
    <ClCompile Include="..\libavfilter\x86\vf_blend_init.c" />
    <ClCompile Include="..\libavfilter\x86\vf_bwdif_init.c" />
    <ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c" />

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -138,6 +138,9 @@
    <ClCompile Include="..\libavfilter\video.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\pthread.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\f_bench.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -333,15 +336,15 @@
    <ClCompile Include="..\libavfilter\asrc_anoisesrc.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\asrc_anullsrc.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\asrc_sine.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
    <ClCompile Include="..\libavfilter\asink_anullsink.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\asrc_anullsrc.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_subtitles.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -762,6 +765,9 @@
    <ClCompile Include="..\libavfilter\vsrc_cellauto.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vsink_nullsink.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vsrc_life.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -771,9 +777,6 @@
    <ClCompile Include="..\libavfilter\vsrc_mptestsrc.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\vsink_nullsink.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\avf_ahistogram.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -807,9 +810,6 @@
    <ClCompile Include="..\libavfilter\src_movie.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\pthread.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\x86\vf_blend_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -87,6 +87,7 @@
    <ClCompile Include="..\libavformat\sdp.c" />
    <ClCompile Include="..\libavformat\url.c" />
    <ClCompile Include="..\libavformat\utils.c" />
+    <ClCompile Include="..\libavformat\file_open.c" />
    <ClCompile Include="..\libavformat\isom.c" />
    <ClCompile Include="..\libavformat\network.c" />
    <ClCompile Include="..\libavformat\riffdec.c" />
@@ -135,9 +136,9 @@
    <ClCompile Include="..\libavformat\sauce.c" />
    <ClCompile Include="..\libavformat\adp.c" />
    <ClCompile Include="..\libavformat\ads.c" />
-    <ClCompile Include="..\libavformat\adxdec.c" />
    <ClCompile Include="..\libavformat\adtsenc.c" />
    <ClCompile Include="..\libavformat\id3v2enc.c" />
+    <ClCompile Include="..\libavformat\adxdec.c" />
    <ClCompile Include="..\libavformat\aea.c" />
    <ClCompile Include="..\libavformat\pcm.c" />
    <ClCompile Include="..\libavformat\afc.c" />
@@ -320,6 +321,7 @@
    <ClCompile Include="..\libavformat\msf.c" />
    <ClCompile Include="..\libavformat\mpsubdec.c" />
    <ClCompile Include="..\libavformat\msnwc_tcp.c" />
+    <ClCompile Include="..\libavformat\mtaf.c" />
    <ClCompile Include="..\libavformat\mtv.c" />
    <ClCompile Include="..\libavformat\musx.c" />
    <ClCompile Include="..\libavformat\mvdec.c" />
@@ -368,10 +370,10 @@
    <ClCompile Include="..\libavformat\idroqdec.c" />
    <ClCompile Include="..\libavformat\idroqenc.c" />
    <ClCompile Include="..\libavformat\rsd.c" />
+    <ClCompile Include="..\libavformat\rpl.c" />
    <ClCompile Include="..\libavformat\rsodec.c" />
    <ClCompile Include="..\libavformat\rso.c" />
    <ClCompile Include="..\libavformat\rsoenc.c" />
-    <ClCompile Include="..\libavformat\rpl.c" />
    <ClCompile Include="..\libavformat\rtpenc_mpegts.c" />
    <ClCompile Include="..\libavformat\rtpenc_aac.c" />
    <ClCompile Include="..\libavformat\rtpenc_latm.c" />
@@ -465,8 +467,8 @@
    <ClCompile Include="..\libavformat\xvag.c" />
    <ClCompile Include="..\libavformat\xwma.c" />
    <ClCompile Include="..\libavformat\yop.c" />
-    <ClCompile Include="..\libavformat\yuv4mpegenc.c" />
    <ClCompile Include="..\libavformat\yuv4mpegdec.c" />
+    <ClCompile Include="..\libavformat\yuv4mpegenc.c" />
    <ClCompile Include="..\libavformat\libgme.c" />
    <ClCompile Include="..\libavformat\libmodplug.c" />
    <ClCompile Include="..\libavformat\libssh.c" />
@@ -485,10 +487,10 @@
    <ClCompile Include="..\libavformat\hlsproto.c" />
    <ClCompile Include="..\libavformat\http.c" />
    <ClCompile Include="..\libavformat\icecast.c" />
+    <ClCompile Include="..\libavformat\md5proto.c" />
    <ClCompile Include="..\libavformat\mmsh.c" />
    <ClCompile Include="..\libavformat\mms.c" />
    <ClCompile Include="..\libavformat\mmst.c" />
-    <ClCompile Include="..\libavformat\md5proto.c" />
    <ClCompile Include="..\libavformat\rtmpproto.c" />
    <ClCompile Include="..\libavformat\rtmppkt.c" />
    <ClCompile Include="..\libavformat\rtpproto.c" />
@@ -498,7 +500,6 @@
    <ClCompile Include="..\libavformat\tls_gnutls.c" />
    <ClCompile Include="..\libavformat\tls.c" />
    <ClCompile Include="..\libavformat\udp.c" />
-    <ClCompile Include="..\libavformat\file_open.c" />
    <ClCompile Include="libavformat\golomb_tab_wrap.c" />
    <ClCompile Include="libavformat\log2_tab_wrap.c" />
  </ItemGroup>

--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -82,6 +82,9 @@
    <ClCompile Include="..\libavformat\utils.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\file_open.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\isom.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -226,15 +229,15 @@
    <ClCompile Include="..\libavformat\ads.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\adxdec.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavformat\adtsenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
    <ClCompile Include="..\libavformat\id3v2enc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\adxdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\aea.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -781,6 +784,9 @@
    <ClCompile Include="..\libavformat\msnwc_tcp.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\mtaf.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\mtv.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -925,6 +931,9 @@
    <ClCompile Include="..\libavformat\rsd.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\rpl.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\rsodec.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -934,9 +943,6 @@
    <ClCompile Include="..\libavformat\rsoenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\rpl.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavformat\rtpenc_mpegts.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -1216,10 +1222,10 @@
    <ClCompile Include="..\libavformat\yop.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\yuv4mpegenc.c">
+    <ClCompile Include="..\libavformat\yuv4mpegdec.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\yuv4mpegdec.c">
+    <ClCompile Include="..\libavformat\yuv4mpegenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
    <ClCompile Include="..\libavformat\libgme.c">
@@ -1276,6 +1282,9 @@
    <ClCompile Include="..\libavformat\icecast.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\md5proto.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\mmsh.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -1285,9 +1294,6 @@
    <ClCompile Include="..\libavformat\mmst.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\md5proto.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavformat\rtmpproto.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -1315,9 +1321,6 @@
    <ClCompile Include="..\libavformat\udp.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\file_open.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
    <ClCompile Include="libavformat\golomb_tab_wrap.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>

--- a/SMP/libavformat/protocol_list.c
+++ b/SMP/libavformat/protocol_list.c
+static const URLProtocol *url_protocols[] = {
+    &ff_async_protocol,
+    &ff_bluray_protocol,
+    &ff_cache_protocol,
+    &ff_concat_protocol,
+    &ff_crypto_protocol,
+    &ff_data_protocol,
+    &ff_ffrtmpcrypt_protocol,
+    &ff_ffrtmphttp_protocol,
+    &ff_file_protocol,
+    &ff_ftp_protocol,
+    &ff_gopher_protocol,
+    &ff_hls_protocol,
+    &ff_http_protocol,
+    &ff_httpproxy_protocol,
+    &ff_https_protocol,
+    &ff_icecast_protocol,
+    &ff_mmsh_protocol,
+    &ff_mmst_protocol,
+    &ff_md5_protocol,
+    &ff_pipe_protocol,
+    &ff_rtmp_protocol,
+    &ff_rtmpe_protocol,
+    &ff_rtmps_protocol,
+    &ff_rtmpt_protocol,
+    &ff_rtmpte_protocol,
+    &ff_rtmpts_protocol,
+    &ff_rtp_protocol,
+    &ff_srtp_protocol,
+    &ff_subfile_protocol,
+    &ff_tcp_protocol,
+    &ff_tls_gnutls_protocol,
+    &ff_udp_protocol,
+    &ff_udplite_protocol,
+    &ff_libssh_protocol,
+    NULL };
\ No newline at end of file
--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -105,6 +105,9 @@
    <ClCompile Include="..\libavutil\des.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavutil\dict.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavutil\display.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
@@ -180,9 +183,6 @@
    <ClCompile Include="..\libavutil\murmur3.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavutil\dict.c">
-      <Filter>Source Files\libavutil</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavutil\opt.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
@@ -338,6 +338,9 @@
    <ClInclude Include="..\libavutil\des.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavutil\dict.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavutil\display.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
@@ -413,9 +416,6 @@
    <ClInclude Include="..\libavutil\murmur3.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
-    <ClInclude Include="..\libavutil\dict.h">
-      <Filter>Header Files\libavutil</Filter>
-    </ClInclude>
    <ClInclude Include="..\libavutil\opt.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
@@ -437,10 +437,10 @@
    <ClInclude Include="..\libavutil\rc4.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
-    <ClInclude Include="..\libavutil\replaygain.h">
+    <ClInclude Include="..\libavutil\rational.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
-    <ClInclude Include="..\libavutil\rational.h">
+    <ClInclude Include="..\libavutil\replaygain.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
    <ClInclude Include="..\libavutil\ripemd.h">

--- a/SMP/libswscale.vcxproj
+++ b/SMP/libswscale.vcxproj
@@ -75,7 +75,9 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\libswscale\alphablend.c" />
+    <ClCompile Include="..\libswscale\hscale.c" />
    <ClCompile Include="..\libswscale\hscale_fast_bilinear.c" />
+    <ClCompile Include="..\libswscale\gamma.c" />
    <ClCompile Include="..\libswscale\input.c">
      <ObjectFileName>$(IntDir)\libswscale_input.obj</ObjectFileName>
    </ClCompile>
@@ -84,14 +86,12 @@
      <ObjectFileName>$(IntDir)\libswscale_output.obj</ObjectFileName>
    </ClCompile>
    <ClCompile Include="..\libswscale\rgb2rgb.c" />
+    <ClCompile Include="..\libswscale\slice.c" />
    <ClCompile Include="..\libswscale\swscale.c" />
    <ClCompile Include="..\libswscale\swscale_unscaled.c" />
    <ClCompile Include="..\libswscale\utils.c" />
    <ClCompile Include="..\libswscale\yuv2rgb.c" />
-    <ClCompile Include="..\libswscale\slice.c" />
-    <ClCompile Include="..\libswscale\hscale.c" />
    <ClCompile Include="..\libswscale\vscale.c" />
-    <ClCompile Include="..\libswscale\gamma.c" />
    <ClCompile Include="..\libswscale\x86\rgb2rgb.c">
      <ObjectFileName>$(IntDir)\libswscale_x86_rgb2rgb.obj</ObjectFileName>
    </ClCompile>

--- a/SMP/libswscale.vcxproj.filters
+++ b/SMP/libswscale.vcxproj.filters
@@ -45,9 +45,15 @@
    <ClCompile Include="..\libswscale\alphablend.c">
      <Filter>Source Files\libswscale</Filter>
    </ClCompile>
+    <ClCompile Include="..\libswscale\hscale.c">
+      <Filter>Source Files\libswscale</Filter>
+    </ClCompile>
    <ClCompile Include="..\libswscale\hscale_fast_bilinear.c">
      <Filter>Source Files\libswscale</Filter>
    </ClCompile>
+    <ClCompile Include="..\libswscale\gamma.c">
+      <Filter>Source Files\libswscale</Filter>
+    </ClCompile>
    <ClCompile Include="..\libswscale\input.c">
      <Filter>Source Files\libswscale</Filter>
    </ClCompile>
@@ -60,6 +66,9 @@
    <ClCompile Include="..\libswscale\rgb2rgb.c">
      <Filter>Source Files\libswscale</Filter>
    </ClCompile>
+    <ClCompile Include="..\libswscale\slice.c">
+      <Filter>Source Files\libswscale</Filter>
+    </ClCompile>
    <ClCompile Include="..\libswscale\swscale.c">
      <Filter>Source Files\libswscale</Filter>
    </ClCompile>
@@ -72,18 +81,9 @@
    <ClCompile Include="..\libswscale\yuv2rgb.c">
      <Filter>Source Files\libswscale</Filter>
    </ClCompile>
-    <ClCompile Include="..\libswscale\slice.c">
-      <Filter>Source Files\libswscale</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libswscale\hscale.c">
-      <Filter>Source Files\libswscale</Filter>
-    </ClCompile>
    <ClCompile Include="..\libswscale\vscale.c">
      <Filter>Source Files\libswscale</Filter>
    </ClCompile>
-    <ClCompile Include="..\libswscale\gamma.c">
-      <Filter>Source Files\libswscale</Filter>
-    </ClCompile>
    <ClCompile Include="..\libswscale\x86\rgb2rgb.c">
      <Filter>Source Files\libswscale\x86</Filter>
    </ClCompile>