project: Update for recent upstream merge.

bd83b262 · Matt Oliver · 21bef9bf · bd83b262 · bd83b262 · bd83b262
12 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -448,6 +448,7 @@
 %define CONFIG_SCALING_VIDEO_EXAMPLE 0
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 %define CONFIG_TRANSCODING_EXAMPLE 0
+%define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_AVISYNTH 1
 %define CONFIG_BZLIB 1
 %define CONFIG_CHROMAPRINT 0
@@ -468,7 +469,6 @@
 %define CONFIG_LIBCDIO 1
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBDC1394 0
-%define CONFIG_LIBDCADEC 0
 %define CONFIG_LIBFAAC 0
 %define CONFIG_LIBFDK_AAC 1
 %define CONFIG_LIBFLITE 0
@@ -484,6 +484,7 @@
 %define CONFIG_LIBMODPLUG 1
 %define CONFIG_LIBMP3LAME 1
 %define CONFIG_LIBNUT 0
+%define CONFIG_LIBNPP 0
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
 %define CONFIG_LIBOPENCV 0
@@ -654,6 +655,7 @@
 %define CONFIG_RV34DSP 1
 %define CONFIG_SINEWIN 1
 %define CONFIG_SNAPPY 1
+%define CONFIG_SRTP 1
 %define CONFIG_STARTCODE 1
 %define CONFIG_TEXTUREDSP 1
 %define CONFIG_TEXTUREDSPENC 1
@@ -668,6 +670,7 @@
 %define CONFIG_AAC_ADTSTOASC_BSF 1
 %define CONFIG_CHOMP_BSF 1
 %define CONFIG_DUMP_EXTRADATA_BSF 1
+%define CONFIG_DCA_CORE_BSF 1
 %define CONFIG_H264_MP4TOANNEXB_BSF 1
 %define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 %define CONFIG_IMX_DUMP_HEADER_BSF 1
@@ -1046,6 +1049,7 @@
 %define CONFIG_ADPCM_G726LE_DECODER 1
 %define CONFIG_ADPCM_IMA_AMV_DECODER 1
 %define CONFIG_ADPCM_IMA_APC_DECODER 1
+%define CONFIG_ADPCM_IMA_DAT4_DECODER 1
 %define CONFIG_ADPCM_IMA_DK3_DECODER 1
 %define CONFIG_ADPCM_IMA_DK4_DECODER 1
 %define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1
@@ -1090,8 +1094,22 @@
 %define CONFIG_VPLAYER_DECODER 1
 %define CONFIG_WEBVTT_DECODER 1
 %define CONFIG_XSUB_DECODER 1
+%define CONFIG_AAC_AT_DECODER 0
+%define CONFIG_AC3_AT_DECODER 0
+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+%define CONFIG_ALAC_AT_DECODER 0
+%define CONFIG_AMR_NB_AT_DECODER 0
+%define CONFIG_EAC3_AT_DECODER 0
+%define CONFIG_GSM_MS_AT_DECODER 0
+%define CONFIG_ILBC_AT_DECODER 0
+%define CONFIG_MP1_AT_DECODER 0
+%define CONFIG_MP2_AT_DECODER 0
+%define CONFIG_MP3_AT_DECODER 0
+%define CONFIG_PCM_ALAW_AT_DECODER 0
+%define CONFIG_PCM_MULAW_AT_DECODER 0
+%define CONFIG_QDMC_AT_DECODER 0
+%define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
-%define CONFIG_LIBDCADEC_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 1
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
@@ -1122,6 +1140,7 @@
 %define CONFIG_AEA_DEMUXER 1
 %define CONFIG_AFC_DEMUXER 1
 %define CONFIG_AIFF_DEMUXER 1
+%define CONFIG_AIX_DEMUXER 1
 %define CONFIG_AMR_DEMUXER 1
 %define CONFIG_ANM_DEMUXER 1
 %define CONFIG_APC_DEMUXER 1
@@ -1241,6 +1260,7 @@
 %define CONFIG_MSF_DEMUXER 1
 %define CONFIG_MSNWC_TCP_DEMUXER 1
 %define CONFIG_MTV_DEMUXER 1
+%define CONFIG_MUSX_DEMUXER 1
 %define CONFIG_MV_DEMUXER 1
 %define CONFIG_MVI_DEMUXER 1
 %define CONFIG_MXF_DEMUXER 1
@@ -1512,6 +1532,11 @@
 %define CONFIG_TEXT_ENCODER 1
 %define CONFIG_WEBVTT_ENCODER 1
 %define CONFIG_XSUB_ENCODER 1
+%define CONFIG_AAC_AT_ENCODER 0
+%define CONFIG_ALAC_AT_ENCODER 0
+%define CONFIG_ILBC_AT_ENCODER 0
+%define CONFIG_PCM_ALAW_AT_ENCODER 0
+%define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBFAAC_ENCODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 1
 %define CONFIG_LIBGSM_ENCODER 0
@@ -1608,6 +1633,7 @@
 %define CONFIG_EXTRASTEREO_FILTER 1
 %define CONFIG_FIREQUALIZER_FILTER 1
 %define CONFIG_FLANGER_FILTER 1
+%define CONFIG_HDCD_FILTER 1
 %define CONFIG_HIGHPASS_FILTER 1
 %define CONFIG_JOIN_FILTER 1
 %define CONFIG_LADSPA_FILTER 0
@@ -1653,8 +1679,10 @@
 %define CONFIG_COLORKEY_FILTER 1
 %define CONFIG_COLORLEVELS_FILTER 1
 %define CONFIG_COLORMATRIX_FILTER 1
+%define CONFIG_COLORSPACE_FILTER 1
 %define CONFIG_CONVOLUTION_FILTER 1
 %define CONFIG_COPY_FILTER 1
+%define CONFIG_COREIMAGE_FILTER 0
 %define CONFIG_COVER_RECT_FILTER 1
 %define CONFIG_CROP_FILTER 1
 %define CONFIG_CROPDETECT_FILTER 1
@@ -1701,6 +1729,8 @@
 %define CONFIG_HISTOGRAM_FILTER 1
 %define CONFIG_HQDN3D_FILTER 1
 %define CONFIG_HQX_FILTER 1
+%define CONFIG_HWDOWNLOAD_FILTER 1
+%define CONFIG_HWUPLOAD_FILTER 1
 %define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HSTACK_FILTER 1
 %define CONFIG_HUE_FILTER 1
@@ -1743,7 +1773,9 @@
 %define CONFIG_PULLUP_FILTER 1
 %define CONFIG_QP_FILTER 1
 %define CONFIG_RANDOM_FILTER 1
+%define CONFIG_READVITC_FILTER 1
 %define CONFIG_REALTIME_FILTER 1
+%define CONFIG_REMAP_FILTER 1
 %define CONFIG_REMOVEGRAIN_FILTER 1
 %define CONFIG_REMOVELOGO_FILTER 1
 %define CONFIG_REPEATFIELDS_FILTER 1
@@ -1752,6 +1784,8 @@
 %define CONFIG_SAB_FILTER 1
 %define CONFIG_SCALE_FILTER 1
 %define CONFIG_SCALE2REF_FILTER 1
+%define CONFIG_SCALE_NPP_FILTER 0
+%define CONFIG_SCALE_VAAPI_FILTER 0
 %define CONFIG_SELECT_FILTER 1
 %define CONFIG_SELECTIVECOLOR_FILTER 1
 %define CONFIG_SENDCMD_FILTER 1
@@ -1802,6 +1836,7 @@
 %define CONFIG_ALLYUV_FILTER 1
 %define CONFIG_CELLAUTO_FILTER 1
 %define CONFIG_COLOR_FILTER 1
+%define CONFIG_COREIMAGESRC_FILTER 0
 %define CONFIG_HALDCLUTSRC_FILTER 1
 %define CONFIG_LIFE_FILTER 1
 %define CONFIG_MANDELBROT_FILTER 1
@@ -1927,14 +1962,17 @@
 %define CONFIG_FLAC_MUXER 1
 %define CONFIG_FLV_MUXER 1
 %define CONFIG_FRAMECRC_MUXER 1
+%define CONFIG_FRAMEHASH_MUXER 1
 %define CONFIG_FRAMEMD5_MUXER 1
 %define CONFIG_G722_MUXER 1
 %define CONFIG_G723_1_MUXER 1
 %define CONFIG_GIF_MUXER 1
+%define CONFIG_GSM_MUXER 1
 %define CONFIG_GXF_MUXER 1
 %define CONFIG_H261_MUXER 1
 %define CONFIG_H263_MUXER 1
 %define CONFIG_H264_MUXER 1
+%define CONFIG_HASH_MUXER 1
 %define CONFIG_HDS_MUXER 1
 %define CONFIG_HEVC_MUXER 1
 %define CONFIG_HLS_MUXER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -490,6 +490,7 @@
 #define CONFIG_SCALING_VIDEO_EXAMPLE 0
 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 #define CONFIG_TRANSCODING_EXAMPLE 0
+#define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_AVISYNTH 1
 #define CONFIG_BZLIB 1
 #define CONFIG_CHROMAPRINT 0
@@ -510,7 +511,6 @@
 #define CONFIG_LIBCDIO 1
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
-#define CONFIG_LIBDCADEC 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFDK_AAC 1
 #define CONFIG_LIBFLITE 0
@@ -526,6 +526,7 @@
 #define CONFIG_LIBMODPLUG 1
 #define CONFIG_LIBMP3LAME 1
 #define CONFIG_LIBNUT 0
+#define CONFIG_LIBNPP 0
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
 #define CONFIG_LIBOPENCV 0
@@ -704,6 +705,7 @@
 #define CONFIG_RV34DSP 1
 #define CONFIG_SINEWIN 1
 #define CONFIG_SNAPPY 1
+#define CONFIG_SRTP 1
 #define CONFIG_STARTCODE 1
 #define CONFIG_TEXTUREDSP 1
 #define CONFIG_TEXTUREDSPENC 1
@@ -718,6 +720,7 @@
 #define CONFIG_AAC_ADTSTOASC_BSF 1
 #define CONFIG_CHOMP_BSF 1
 #define CONFIG_DUMP_EXTRADATA_BSF 1
+#define CONFIG_DCA_CORE_BSF 1
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
 #define CONFIG_HEVC_MP4TOANNEXB_BSF 1
 #define CONFIG_IMX_DUMP_HEADER_BSF 1
@@ -1096,6 +1099,7 @@
 #define CONFIG_ADPCM_G726LE_DECODER 1
 #define CONFIG_ADPCM_IMA_AMV_DECODER 1
 #define CONFIG_ADPCM_IMA_APC_DECODER 1
+#define CONFIG_ADPCM_IMA_DAT4_DECODER 1
 #define CONFIG_ADPCM_IMA_DK3_DECODER 1
 #define CONFIG_ADPCM_IMA_DK4_DECODER 1
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 1
@@ -1140,8 +1144,22 @@
 #define CONFIG_VPLAYER_DECODER 1
 #define CONFIG_WEBVTT_DECODER 1
 #define CONFIG_XSUB_DECODER 1
+#define CONFIG_AAC_AT_DECODER 0
+#define CONFIG_AC3_AT_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
+#define CONFIG_ALAC_AT_DECODER 0
+#define CONFIG_AMR_NB_AT_DECODER 0
+#define CONFIG_EAC3_AT_DECODER 0
+#define CONFIG_GSM_MS_AT_DECODER 0
+#define CONFIG_ILBC_AT_DECODER 0
+#define CONFIG_MP1_AT_DECODER 0
+#define CONFIG_MP2_AT_DECODER 0
+#define CONFIG_MP3_AT_DECODER 0
+#define CONFIG_PCM_ALAW_AT_DECODER 0
+#define CONFIG_PCM_MULAW_AT_DECODER 0
+#define CONFIG_QDMC_AT_DECODER 0
+#define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBDCADEC_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 1
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
@@ -1172,6 +1190,7 @@
 #define CONFIG_AEA_DEMUXER 1
 #define CONFIG_AFC_DEMUXER 1
 #define CONFIG_AIFF_DEMUXER 1
+#define CONFIG_AIX_DEMUXER 1
 #define CONFIG_AMR_DEMUXER 1
 #define CONFIG_ANM_DEMUXER 1
 #define CONFIG_APC_DEMUXER 1
@@ -1291,6 +1310,7 @@
 #define CONFIG_MSF_DEMUXER 1
 #define CONFIG_MSNWC_TCP_DEMUXER 1
 #define CONFIG_MTV_DEMUXER 1
+#define CONFIG_MUSX_DEMUXER 1
 #define CONFIG_MV_DEMUXER 1
 #define CONFIG_MVI_DEMUXER 1
 #define CONFIG_MXF_DEMUXER 1
@@ -1562,6 +1582,11 @@
 #define CONFIG_TEXT_ENCODER 1
 #define CONFIG_WEBVTT_ENCODER 1
 #define CONFIG_XSUB_ENCODER 1
+#define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_ALAC_AT_ENCODER 0
+#define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_PCM_ALAW_AT_ENCODER 0
+#define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 1
 #define CONFIG_LIBGSM_ENCODER 0
@@ -1658,6 +1683,7 @@
 #define CONFIG_EXTRASTEREO_FILTER 1
 #define CONFIG_FIREQUALIZER_FILTER 1
 #define CONFIG_FLANGER_FILTER 1
+#define CONFIG_HDCD_FILTER 1
 #define CONFIG_HIGHPASS_FILTER 1
 #define CONFIG_JOIN_FILTER 1
 #define CONFIG_LADSPA_FILTER 0
@@ -1703,8 +1729,10 @@
 #define CONFIG_COLORKEY_FILTER 1
 #define CONFIG_COLORLEVELS_FILTER 1
 #define CONFIG_COLORMATRIX_FILTER 1
+#define CONFIG_COLORSPACE_FILTER 1
 #define CONFIG_CONVOLUTION_FILTER 1
 #define CONFIG_COPY_FILTER 1
+#define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 1
 #define CONFIG_CROP_FILTER 1
 #define CONFIG_CROPDETECT_FILTER 1
@@ -1751,6 +1779,8 @@
 #define CONFIG_HISTOGRAM_FILTER 1
 #define CONFIG_HQDN3D_FILTER 1
 #define CONFIG_HQX_FILTER 1
+#define CONFIG_HWDOWNLOAD_FILTER 1
+#define CONFIG_HWUPLOAD_FILTER 1
 #define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 1
 #define CONFIG_HUE_FILTER 1
@@ -1793,7 +1823,9 @@
 #define CONFIG_PULLUP_FILTER 1
 #define CONFIG_QP_FILTER 1
 #define CONFIG_RANDOM_FILTER 1
+#define CONFIG_READVITC_FILTER 1
 #define CONFIG_REALTIME_FILTER 1
+#define CONFIG_REMAP_FILTER 1
 #define CONFIG_REMOVEGRAIN_FILTER 1
 #define CONFIG_REMOVELOGO_FILTER 1
 #define CONFIG_REPEATFIELDS_FILTER 1
@@ -1802,6 +1834,8 @@
 #define CONFIG_SAB_FILTER 1
 #define CONFIG_SCALE_FILTER 1
 #define CONFIG_SCALE2REF_FILTER 1
+#define CONFIG_SCALE_NPP_FILTER 0
+#define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SELECT_FILTER 1
 #define CONFIG_SELECTIVECOLOR_FILTER 1
 #define CONFIG_SENDCMD_FILTER 1
@@ -1852,6 +1886,7 @@
 #define CONFIG_ALLYUV_FILTER 1
 #define CONFIG_CELLAUTO_FILTER 1
 #define CONFIG_COLOR_FILTER 1
+#define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_HALDCLUTSRC_FILTER 1
 #define CONFIG_LIFE_FILTER 1
 #define CONFIG_MANDELBROT_FILTER 1
@@ -1987,14 +2022,17 @@
 #define CONFIG_FLAC_MUXER 1
 #define CONFIG_FLV_MUXER 1
 #define CONFIG_FRAMECRC_MUXER 1
+#define CONFIG_FRAMEHASH_MUXER 1
 #define CONFIG_FRAMEMD5_MUXER 1
 #define CONFIG_G722_MUXER 1
 #define CONFIG_G723_1_MUXER 1
 #define CONFIG_GIF_MUXER 1
+#define CONFIG_GSM_MUXER 1
 #define CONFIG_GXF_MUXER 1
 #define CONFIG_H261_MUXER 1
 #define CONFIG_H263_MUXER 1
 #define CONFIG_H264_MUXER 1
+#define CONFIG_HASH_MUXER 1
 #define CONFIG_HDS_MUXER 1
 #define CONFIG_HEVC_MUXER 1
 #define CONFIG_HLS_MUXER 1

--- a/SMP/libavcodec.def
+++ b/SMP/libavcodec.def
@@ -9,6 +9,14 @@ EXPORTS
    av_bitstream_filter_filter
    av_bitstream_filter_init
    av_bitstream_filter_next
+    av_bsf_alloc
+    av_bsf_free
+    av_bsf_get_by_name
+    av_bsf_get_class
+    av_bsf_init
+    av_bsf_next
+    av_bsf_receive_packet
+    av_bsf_send_packet
    av_codec_get_chroma_intra_matrix
    av_codec_get_codec_descriptor
    av_codec_get_codec_properties
@@ -45,6 +53,7 @@ EXPORTS
    av_fopen_utf8
    av_free_packet
    av_get_audio_frame_duration
+    av_get_audio_frame_duration2
    av_get_bits_per_sample
    av_get_codec_tag_string
    av_get_exact_bits_per_sample
@@ -155,6 +164,11 @@ EXPORTS
    avcodec_is_open
    avcodec_license
    avcodec_open2
+    avcodec_parameters_alloc
+    avcodec_parameters_copy
+    avcodec_parameters_free
+    avcodec_parameters_from_context
+    avcodec_parameters_to_context
    avcodec_pix_fmt_to_codec_tag
    avcodec_profile_name
    avcodec_register

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -157,6 +157,8 @@
    <ClCompile Include="..\libavcodec\avpicture.c" />
    <ClCompile Include="..\libavcodec\bitstream.c" />
    <ClCompile Include="..\libavcodec\bitstream_filter.c" />
+    <ClCompile Include="..\libavcodec\bitstream_filters.c" />
+    <ClCompile Include="..\libavcodec\bsf.c" />
    <ClCompile Include="..\libavcodec\codec_desc.c" />
    <ClCompile Include="..\libavcodec\d3d11va.c" />
    <ClCompile Include="..\libavcodec\dirac.c" />
@@ -959,6 +961,7 @@
    <ClCompile Include="..\libavcodec\aac_adtstoasc_bsf.c" />
    <ClCompile Include="..\libavcodec\chomp_bsf.c" />
    <ClCompile Include="..\libavcodec\dump_extradata_bsf.c" />
+    <ClCompile Include="..\libavcodec\dca_core_bsf.c" />
    <ClCompile Include="..\libavcodec\h264_mp4toannexb_bsf.c" />
    <ClCompile Include="..\libavcodec\hevc_mp4toannexb_bsf.c" />
    <ClCompile Include="..\libavcodec\imx_dump_header_bsf.c" />

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -291,6 +291,12 @@
    <ClCompile Include="..\libavcodec\bitstream_filter.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\bitstream_filters.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\codec_desc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2457,6 +2463,9 @@
    <ClCompile Include="..\libavcodec\dump_extradata_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\dca_core_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\h264_mp4toannexb_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -71,6 +71,7 @@
  <ItemGroup>
    <YASM Include="..\libavfilter\x86\vf_blend.asm" />
    <YASM Include="..\libavfilter\x86\vf_bwdif.asm" />
+    <YASM Include="..\libavfilter\x86\colorspacedsp.asm" />
    <YASM Include="..\libavfilter\x86\vf_fspp.asm" />
    <YASM Include="..\libavfilter\x86\vf_gradfun.asm" />
    <YASM Include="..\libavfilter\x86\vf_hqdn3d.asm" />
@@ -170,6 +171,7 @@
      <ObjectFileName>$(IntDir)\libavfilter_af_volume.obj</ObjectFileName>
    </ClCompile>
    <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" />
@@ -199,6 +201,10 @@
    <ClCompile Include="..\libavfilter\vf_colorkey.c" />
    <ClCompile Include="..\libavfilter\vf_colorlevels.c" />
    <ClCompile Include="..\libavfilter\vf_colormatrix.c" />
+    <ClCompile Include="..\libavfilter\vf_colorspace.c" />
+    <ClCompile Include="..\libavfilter\colorspacedsp.c">
+      <ObjectFileName>$(IntDir)\libavfilter_colorspacedsp.obj</ObjectFileName>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_convolution.c" />
    <ClCompile Include="..\libavfilter\vf_copy.c" />
    <ClCompile Include="..\libavfilter\vf_cover_rect.c" />
@@ -249,6 +255,8 @@
      <ObjectFileName>$(IntDir)\libavfilter_vf_hqdn3d.obj</ObjectFileName>
    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_hqx.c" />
+    <ClCompile Include="..\libavfilter\vf_hwdownload.c" />
+    <ClCompile Include="..\libavfilter\vf_hwupload.c" />
    <ClCompile Include="..\libavfilter\vf_stack.c" />
    <ClCompile Include="..\libavfilter\vf_hue.c" />
    <ClCompile Include="..\libavfilter\vf_idet.c">
@@ -290,6 +298,8 @@
    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_qp.c" />
    <ClCompile Include="..\libavfilter\vf_random.c" />
+    <ClCompile Include="..\libavfilter\vf_readvitc.c" />
+    <ClCompile Include="..\libavfilter\vf_remap.c" />
    <ClCompile Include="..\libavfilter\vf_removegrain.c">
      <ObjectFileName>$(IntDir)\libavfilter_vf_removegrain.obj</ObjectFileName>
    </ClCompile>
@@ -358,6 +368,7 @@
    <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" />
    <ClCompile Include="..\libavfilter\x86\vf_eq.c">
      <ObjectFileName>$(IntDir)\libavfilter_x86_vf_eq.obj</ObjectFileName>
    </ClCompile>

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -37,6 +37,9 @@
    <YASM Include="..\libavfilter\x86\vf_bwdif.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </YASM>
+    <YASM Include="..\libavfilter\x86\colorspacedsp.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </YASM>
    <YASM Include="..\libavfilter\x86\vf_fspp.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </YASM>
@@ -324,6 +327,9 @@
    <ClCompile Include="..\libavfilter\af_volumedetect.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\af_hdcd.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\asrc_anoisesrc.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -399,6 +405,12 @@
    <ClCompile Include="..\libavfilter\vf_colormatrix.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_colorspace.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\colorspacedsp.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_convolution.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -531,6 +543,12 @@
    <ClCompile Include="..\libavfilter\vf_hqx.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_hwdownload.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_hwupload.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_stack.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -618,6 +636,12 @@
    <ClCompile Include="..\libavfilter\vf_random.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_readvitc.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_remap.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_removegrain.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -792,6 +816,9 @@
    <ClCompile Include="..\libavfilter\x86\vf_bwdif_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\x86\vf_eq.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -115,11 +115,12 @@
    <ClCompile Include="..\libavformat\rtpdec_qdm2.c" />
    <ClCompile Include="..\libavformat\rtpdec_qt.c" />
    <ClCompile Include="..\libavformat\rtpdec_svq3.c" />
+    <ClCompile Include="..\libavformat\rtpdec_vc2hq.c" />
    <ClCompile Include="..\libavformat\rtpdec_vp8.c" />
    <ClCompile Include="..\libavformat\rtpdec_vp9.c" />
    <ClCompile Include="..\libavformat\rtpdec_xiph.c" />
-    <ClCompile Include="..\libavformat\srtp.c" />
    <ClCompile Include="..\libavformat\rtpenc_chain.c" />
+    <ClCompile Include="..\libavformat\srtp.c" />
    <ClCompile Include="..\libavformat\a64.c" />
    <ClCompile Include="..\libavformat\rawenc.c" />
    <ClCompile Include="..\libavformat\aadec.c" />
@@ -143,6 +144,7 @@
    <ClCompile Include="..\libavformat\aiffdec.c" />
    <ClCompile Include="..\libavformat\mov_chan.c" />
    <ClCompile Include="..\libavformat\aiffenc.c" />
+    <ClCompile Include="..\libavformat\aixdec.c" />
    <ClCompile Include="..\libavformat\amr.c" />
    <ClCompile Include="..\libavformat\anm.c" />
    <ClCompile Include="..\libavformat\apc.c" />
@@ -233,7 +235,7 @@
    <ClCompile Include="..\libavformat\4xm.c" />
    <ClCompile Include="..\libavformat\framecrcenc.c" />
    <ClCompile Include="..\libavformat\framehash.c" />
-    <ClCompile Include="..\libavformat\md5enc.c" />
+    <ClCompile Include="..\libavformat\hashenc.c" />
    <ClCompile Include="..\libavformat\frmdec.c" />
    <ClCompile Include="..\libavformat\fsb.c" />
    <ClCompile Include="..\libavformat\gif.c" />
@@ -319,6 +321,7 @@
    <ClCompile Include="..\libavformat\mpsubdec.c" />
    <ClCompile Include="..\libavformat\msnwc_tcp.c" />
    <ClCompile Include="..\libavformat\mtv.c" />
+    <ClCompile Include="..\libavformat\musx.c" />
    <ClCompile Include="..\libavformat\mvdec.c" />
    <ClCompile Include="..\libavformat\mvi.c" />
    <ClCompile Include="..\libavformat\mxfdec.c" />

--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -166,6 +166,9 @@
    <ClCompile Include="..\libavformat\rtpdec_svq3.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\rtpdec_vc2hq.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\rtpdec_vp8.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -175,10 +178,10 @@
    <ClCompile Include="..\libavformat\rtpdec_xiph.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\srtp.c">
+    <ClCompile Include="..\libavformat\rtpenc_chain.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\rtpenc_chain.c">
+    <ClCompile Include="..\libavformat\srtp.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
    <ClCompile Include="..\libavformat\a64.c">
@@ -250,6 +253,9 @@
    <ClCompile Include="..\libavformat\aiffenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\aixdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\amr.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
@@ -520,7 +526,7 @@
    <ClCompile Include="..\libavformat\framehash.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavformat\md5enc.c">
+    <ClCompile Include="..\libavformat\hashenc.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
    <ClCompile Include="..\libavformat\frmdec.c">
@@ -778,6 +784,9 @@
    <ClCompile Include="..\libavformat\mtv.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavformat\musx.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavformat\mvdec.c">
      <Filter>Source Files\libavformat</Filter>
    </ClCompile>

--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -231,6 +231,9 @@ EXPORTS
    av_hmac_update
    av_hwdevice_ctx_alloc
    av_hwdevice_ctx_init
+    av_hwdevice_get_hwframe_constraints
+    av_hwdevice_hwconfig_alloc
+    av_hwframe_constraints_free
    av_hwframe_ctx_alloc
    av_hwframe_ctx_init
    av_hwframe_get_buffer

--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -193,6 +193,7 @@
    <ClInclude Include="..\libavutil\hmac.h" />
    <ClInclude Include="..\libavutil\hwcontext.h" />
    <ClInclude Include="..\libavutil\hwcontext_cuda.h" />
+    <ClInclude Include="..\libavutil\hwcontext_vaapi.h" />
    <ClInclude Include="..\libavutil\hwcontext_vdpau.h" />
    <ClInclude Include="..\libavutil\imgutils.h" />
    <ClInclude Include="..\libavutil\intfloat.h" />
@@ -537,6 +538,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -675,6 +677,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -819,6 +822,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -967,6 +971,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1116,6 +1121,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1264,6 +1270,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1413,6 +1420,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1557,6 +1565,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1707,6 +1716,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1856,6 +1866,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2006,6 +2017,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2155,6 +2167,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2299,6 +2312,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2443,6 +2457,7 @@ copy ..\libavutil\hash.h $(OutDir)\include\libavutil
 copy ..\libavutil\hmac.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil

--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -371,6 +371,9 @@
    <ClInclude Include="..\libavutil\hwcontext_cuda.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavutil\hwcontext_vaapi.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavutil\hwcontext_vdpau.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>