From 5e55240f8f3632007fa06ffa7ff4617d4e7a8c2c Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 11 Sep 2016 18:47:26 +1000 Subject: [PATCH] projects: Update for recent upstream merge. --- SMP/config.asm | 12 ++++++++++++ SMP/config.h | 12 ++++++++++++ SMP/libavfilter.vcxproj | 6 ++++-- SMP/libavfilter.vcxproj.filters | 18 ++++++++++++------ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/SMP/config.asm b/SMP/config.asm index 6e63130b4cd6b..336b0fec78989 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -1146,8 +1146,13 @@ %define CONFIG_XBIN_DECODER 1 %define CONFIG_IDF_DECODER 1 %define CONFIG_LIBOPENH264_DECODER 0 +%define CONFIG_H263_CUVID_DECODER 0 %define CONFIG_H264_CUVID_DECODER 0 %define CONFIG_HEVC_CUVID_DECODER 0 +%define CONFIG_MJPEG_CUVID_DECODER 0 +%define CONFIG_MPEG1_CUVID_DECODER 0 +%define CONFIG_MPEG2_CUVID_DECODER 0 +%define CONFIG_MPEG4_CUVID_DECODER 0 %define CONFIG_VC1_CUVID_DECODER 0 %define CONFIG_VP8_CUVID_DECODER 0 %define CONFIG_VP9_CUVID_DECODER 0 @@ -1705,6 +1710,7 @@ %define CONFIG_ALPHAMERGE_FILTER 1 %define CONFIG_ASS_FILTER 1 %define CONFIG_ATADENOISE_FILTER 1 +%define CONFIG_AVGBLUR_FILTER 1 %define CONFIG_BBOX_FILTER 1 %define CONFIG_BENCH_FILTER 1 %define CONFIG_BITPLANENOISE_FILTER 1 @@ -1763,6 +1769,7 @@ %define CONFIG_FRAMESTEP_FILTER 1 %define CONFIG_FREI0R_FILTER 0 %define CONFIG_FSPP_FILTER 1 +%define CONFIG_GBLUR_FILTER 1 %define CONFIG_GEQ_FILTER 1 %define CONFIG_GRADFUN_FILTER 1 %define CONFIG_HALDCLUT_FILTER 1 @@ -1913,6 +1920,7 @@ %define CONFIG_SPECTRUMSYNTH_FILTER 1 %define CONFIG_AMOVIE_FILTER 1 %define CONFIG_MOVIE_FILTER 1 +%define CONFIG_H263_CUVID_HWACCEL 0 %define CONFIG_H263_VAAPI_HWACCEL 0 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 %define CONFIG_H264_CUVID_HWACCEL 0 @@ -1932,9 +1940,12 @@ %define CONFIG_HEVC_QSV_HWACCEL 1 %define CONFIG_HEVC_VAAPI_HWACCEL 0 %define CONFIG_HEVC_VDPAU_HWACCEL 0 +%define CONFIG_MJPEG_CUVID_HWACCEL 0 +%define CONFIG_MPEG1_CUVID_HWACCEL 0 %define CONFIG_MPEG1_XVMC_HWACCEL 0 %define CONFIG_MPEG1_VDPAU_HWACCEL 0 %define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 +%define CONFIG_MPEG2_CUVID_HWACCEL 0 %define CONFIG_MPEG2_XVMC_HWACCEL 0 %define CONFIG_MPEG2_D3D11VA_HWACCEL 1 %define CONFIG_MPEG2_DXVA2_HWACCEL 1 @@ -1943,6 +1954,7 @@ %define CONFIG_MPEG2_VAAPI_HWACCEL 0 %define CONFIG_MPEG2_VDPAU_HWACCEL 0 %define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 +%define CONFIG_MPEG4_CUVID_HWACCEL 0 %define CONFIG_MPEG4_MMAL_HWACCEL 0 %define CONFIG_MPEG4_VAAPI_HWACCEL 0 %define CONFIG_MPEG4_VDPAU_HWACCEL 0 diff --git a/SMP/config.h b/SMP/config.h index bded687a690a6..3959bcc80435f 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -1196,8 +1196,13 @@ #define CONFIG_XBIN_DECODER 1 #define CONFIG_IDF_DECODER 1 #define CONFIG_LIBOPENH264_DECODER 0 +#define CONFIG_H263_CUVID_DECODER 0 #define CONFIG_H264_CUVID_DECODER 0 #define CONFIG_HEVC_CUVID_DECODER 0 +#define CONFIG_MJPEG_CUVID_DECODER 0 +#define CONFIG_MPEG1_CUVID_DECODER 0 +#define CONFIG_MPEG2_CUVID_DECODER 0 +#define CONFIG_MPEG4_CUVID_DECODER 0 #define CONFIG_VC1_CUVID_DECODER 0 #define CONFIG_VP8_CUVID_DECODER 0 #define CONFIG_VP9_CUVID_DECODER 0 @@ -1755,6 +1760,7 @@ #define CONFIG_ALPHAMERGE_FILTER 1 #define CONFIG_ASS_FILTER 1 #define CONFIG_ATADENOISE_FILTER 1 +#define CONFIG_AVGBLUR_FILTER 1 #define CONFIG_BBOX_FILTER 1 #define CONFIG_BENCH_FILTER 1 #define CONFIG_BITPLANENOISE_FILTER 1 @@ -1813,6 +1819,7 @@ #define CONFIG_FRAMESTEP_FILTER 1 #define CONFIG_FREI0R_FILTER 0 #define CONFIG_FSPP_FILTER 1 +#define CONFIG_GBLUR_FILTER 1 #define CONFIG_GEQ_FILTER 1 #define CONFIG_GRADFUN_FILTER 1 #define CONFIG_HALDCLUT_FILTER 1 @@ -1963,6 +1970,7 @@ #define CONFIG_SPECTRUMSYNTH_FILTER 1 #define CONFIG_AMOVIE_FILTER 1 #define CONFIG_MOVIE_FILTER 1 +#define CONFIG_H263_CUVID_HWACCEL 0 #define CONFIG_H263_VAAPI_HWACCEL 0 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 #define CONFIG_H264_CUVID_HWACCEL 0 @@ -1982,9 +1990,12 @@ #define CONFIG_HEVC_QSV_HWACCEL 1 #define CONFIG_HEVC_VAAPI_HWACCEL 0 #define CONFIG_HEVC_VDPAU_HWACCEL 0 +#define CONFIG_MJPEG_CUVID_HWACCEL 0 +#define CONFIG_MPEG1_CUVID_HWACCEL 0 #define CONFIG_MPEG1_XVMC_HWACCEL 0 #define CONFIG_MPEG1_VDPAU_HWACCEL 0 #define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_MPEG2_CUVID_HWACCEL 0 #define CONFIG_MPEG2_XVMC_HWACCEL 0 #define CONFIG_MPEG2_D3D11VA_HWACCEL 1 #define CONFIG_MPEG2_DXVA2_HWACCEL 1 @@ -1993,6 +2004,7 @@ #define CONFIG_MPEG2_VAAPI_HWACCEL 0 #define CONFIG_MPEG2_VDPAU_HWACCEL 0 #define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_MPEG4_CUVID_HWACCEL 0 #define CONFIG_MPEG4_MMAL_HWACCEL 0 #define CONFIG_MPEG4_VAAPI_HWACCEL 0 #define CONFIG_MPEG4_VDPAU_HWACCEL 0 diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index 8498421f08775..5f5d46b6c32d2 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -174,13 +174,14 @@ + - + @@ -233,6 +234,7 @@ + @@ -309,10 +311,10 @@ - + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index 12d1f6d3f377e..7a7a46aa4c8b8 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -342,13 +342,13 @@ Source Files\libavfilter - + Source Files\libavfilter - + Source Files\libavfilter - + Source Files\libavfilter @@ -363,6 +363,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -519,6 +522,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -747,9 +753,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter @@ -759,6 +762,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter