nvenc: Fix build when cuda is found but nvenc is disabled

tests\check\meson.build:21:5: ERROR:  Unknown variable "use_nvenc_gl".

Also do the same change in nvdec, just to be defensive about future
issues.
This commit is contained in:
Nirbheek Chauhan 2019-03-11 14:45:14 +05:30
parent 01a402e4ec
commit 48d897f65f
2 changed files with 6 additions and 5 deletions

View file

@ -3,13 +3,14 @@ nvdec_sources = [
'plugin.c'
]
nvcuvid_dep_found = false
nvcuvid_incdirs = []
nvdec_option = get_option('nvdec')
if nvdec_option.disabled()
subdir_done()
endif
nvcuvid_dep_found = false
nvcuvid_incdirs = []
if host_machine.system() == 'windows'
cuda_libdirs = [cuda_libdir]
# NOTE: Newer CUDA toolkit versions do not ship with the nvcuvid library, and

View file

@ -5,14 +5,14 @@ nvenc_sources = [
'gstnvh265enc.c',
]
use_nvenc_gl = false
extra_c_args = []
nvenc_option = get_option('nvenc')
if nvenc_option.disabled()
subdir_done()
endif
use_nvenc_gl = false
extra_c_args = []
if host_machine.system() == 'windows'
if cc.has_header('cuda_gl_interop.h', args: '-I' + cuda_incdir)
use_nvenc_gl = true