Skip to content

Commit

Permalink
projects: Update for recent upstream merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed May 27, 2020
1 parent 1a90bb2 commit accce3a
Show file tree
Hide file tree
Showing 16 changed files with 132 additions and 15 deletions.
10 changes: 10 additions & 0 deletions SMP/config.asm
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@
%define CONFIG_LIBXCB_SHAPE 0
%define CONFIG_LIBXCB_XFIXES 0
%define CONFIG_LZMA 1
%define CONFIG_MEDIAFOUNDATION 1
%define CONFIG_SCHANNEL 0
%define CONFIG_SDL2 1
%define CONFIG_SECURETRANSPORT 0
Expand Down Expand Up @@ -906,6 +907,7 @@
%define CONFIG_MVHA_DECODER 1
%define CONFIG_MWSC_DECODER 1
%define CONFIG_MXPEG_DECODER 1
%define CONFIG_NOTCHLC_DECODER 1
%define CONFIG_NUV_DECODER 1
%define CONFIG_PAF_VIDEO_DECODER 1
%define CONFIG_PAM_DECODER 1
Expand Down Expand Up @@ -1440,8 +1442,11 @@
%define CONFIG_WEBVTT_ENCODER 1
%define CONFIG_XSUB_ENCODER 1
%define CONFIG_AAC_AT_ENCODER 0
%define CONFIG_AAC_MF_ENCODER 1
%define CONFIG_AC3_MF_ENCODER 1
%define CONFIG_ALAC_AT_ENCODER 0
%define CONFIG_ILBC_AT_ENCODER 0
%define CONFIG_MP3_MF_ENCODER 1
%define CONFIG_PCM_ALAW_AT_ENCODER 0
%define CONFIG_PCM_MULAW_AT_ENCODER 0
%define CONFIG_LIBAOM_AV1_ENCODER 0
Expand Down Expand Up @@ -1476,6 +1481,7 @@
%define CONFIG_H263_V4L2M2M_ENCODER 0
%define CONFIG_LIBOPENH264_ENCODER 0
%define CONFIG_H264_AMF_ENCODER 1
%define CONFIG_H264_MF_ENCODER 1
%define CONFIG_H264_NVENC_ENCODER 1
%define CONFIG_H264_OMX_ENCODER 0
%define CONFIG_H264_QSV_ENCODER 1
Expand All @@ -1486,6 +1492,7 @@
%define CONFIG_NVENC_H264_ENCODER 1
%define CONFIG_NVENC_HEVC_ENCODER 1
%define CONFIG_HEVC_AMF_ENCODER 1
%define CONFIG_HEVC_MF_ENCODER 1
%define CONFIG_HEVC_NVENC_ENCODER 1
%define CONFIG_HEVC_QSV_ENCODER 1
%define CONFIG_HEVC_V4L2M2M_ENCODER 0
Expand Down Expand Up @@ -1966,6 +1973,7 @@
%define CONFIG_SCALE_VAAPI_FILTER 0
%define CONFIG_SCALE_VULKAN_FILTER 0
%define CONFIG_SCALE2REF_FILTER 1
%define CONFIG_SCDET_FILTER 1
%define CONFIG_SCROLL_FILTER 1
%define CONFIG_SELECT_FILTER 1
%define CONFIG_SELECTIVECOLOR_FILTER 1
Expand Down Expand Up @@ -2022,6 +2030,7 @@
%define CONFIG_UNPREMULTIPLY_FILTER 1
%define CONFIG_UNSHARP_FILTER 1
%define CONFIG_UNSHARP_OPENCL_FILTER 0
%define CONFIG_UNTILE_FILTER 1
%define CONFIG_USPP_FILTER 1
%define CONFIG_V360_FILTER 1
%define CONFIG_VAGUEDENOISER_FILTER 1
Expand Down Expand Up @@ -2055,6 +2064,7 @@
%define CONFIG_COLOR_FILTER 1
%define CONFIG_COREIMAGESRC_FILTER 0
%define CONFIG_FREI0R_SRC_FILTER 0
%define CONFIG_GRADIENTS_FILTER 1
%define CONFIG_HALDCLUTSRC_FILTER 1
%define CONFIG_LIFE_FILTER 1
%define CONFIG_MANDELBROT_FILTER 1
Expand Down
10 changes: 10 additions & 0 deletions SMP/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,7 @@
#define CONFIG_LIBXCB_SHAPE 0
#define CONFIG_LIBXCB_XFIXES 0
#define CONFIG_LZMA 1
#define CONFIG_MEDIAFOUNDATION 1
#define CONFIG_SCHANNEL 0
#define CONFIG_SDL2 1
#define CONFIG_SECURETRANSPORT 0
Expand Down Expand Up @@ -976,6 +977,7 @@
#define CONFIG_MVHA_DECODER 1
#define CONFIG_MWSC_DECODER 1
#define CONFIG_MXPEG_DECODER 1
#define CONFIG_NOTCHLC_DECODER 1
#define CONFIG_NUV_DECODER 1
#define CONFIG_PAF_VIDEO_DECODER 1
#define CONFIG_PAM_DECODER 1
Expand Down Expand Up @@ -1510,8 +1512,11 @@
#define CONFIG_WEBVTT_ENCODER 1
#define CONFIG_XSUB_ENCODER 1
#define CONFIG_AAC_AT_ENCODER 0
#define CONFIG_AAC_MF_ENCODER 1
#define CONFIG_AC3_MF_ENCODER 1
#define CONFIG_ALAC_AT_ENCODER 0
#define CONFIG_ILBC_AT_ENCODER 0
#define CONFIG_MP3_MF_ENCODER 1
#define CONFIG_PCM_ALAW_AT_ENCODER 0
#define CONFIG_PCM_MULAW_AT_ENCODER 0
#define CONFIG_LIBAOM_AV1_ENCODER 0
Expand Down Expand Up @@ -1546,6 +1551,7 @@
#define CONFIG_H263_V4L2M2M_ENCODER 0
#define CONFIG_LIBOPENH264_ENCODER 0
#define CONFIG_H264_AMF_ENCODER 1
#define CONFIG_H264_MF_ENCODER 1
#define CONFIG_H264_NVENC_ENCODER 1
#define CONFIG_H264_OMX_ENCODER 0
#define CONFIG_H264_QSV_ENCODER 1
Expand All @@ -1556,6 +1562,7 @@
#define CONFIG_NVENC_H264_ENCODER 1
#define CONFIG_NVENC_HEVC_ENCODER 1
#define CONFIG_HEVC_AMF_ENCODER 1
#define CONFIG_HEVC_MF_ENCODER 1
#define CONFIG_HEVC_NVENC_ENCODER 1
#define CONFIG_HEVC_QSV_ENCODER 1
#define CONFIG_HEVC_V4L2M2M_ENCODER 0
Expand Down Expand Up @@ -2088,6 +2095,7 @@
#define CONFIG_SCALE_VAAPI_FILTER 0
#define CONFIG_SCALE_VULKAN_FILTER 0
#define CONFIG_SCALE2REF_FILTER 1
#define CONFIG_SCDET_FILTER 1
#define CONFIG_SCROLL_FILTER 1
#define CONFIG_SELECT_FILTER 1
#define CONFIG_SELECTIVECOLOR_FILTER 1
Expand Down Expand Up @@ -2144,6 +2152,7 @@
#define CONFIG_UNPREMULTIPLY_FILTER 1
#define CONFIG_UNSHARP_FILTER 1
#define CONFIG_UNSHARP_OPENCL_FILTER 0
#define CONFIG_UNTILE_FILTER 1
#define CONFIG_USPP_FILTER 1
#define CONFIG_V360_FILTER 1
#define CONFIG_VAGUEDENOISER_FILTER 1
Expand Down Expand Up @@ -2177,6 +2186,7 @@
#define CONFIG_COLOR_FILTER 1
#define CONFIG_COREIMAGESRC_FILTER 0
#define CONFIG_FREI0R_SRC_FILTER 0
#define CONFIG_GRADIENTS_FILTER 1
#define CONFIG_HALDCLUTSRC_FILTER 1
#define CONFIG_LIFE_FILTER 1
#define CONFIG_MANDELBROT_FILTER 1
Expand Down
Loading

0 comments on commit accce3a

Please sign in to comment.