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
Sibras committed Nov 6, 2016
1 parent 2578987 commit 4694cb4
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 32 deletions.
2 changes: 0 additions & 2 deletions SMP/config.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,6 @@
%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_HEVC_MEDIACODEC_DECODER 0
Expand Down Expand Up @@ -1929,7 +1928,6 @@
%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
Expand Down
2 changes: 0 additions & 2 deletions SMP/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,6 @@
#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_HEVC_MEDIACODEC_DECODER 0
Expand Down Expand Up @@ -1979,7 +1978,6 @@
#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
Expand Down
Loading

0 comments on commit 4694cb4

Please sign in to comment.