diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-03-11 14:45:14 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-03-11 14:45:14 +0530 |
commit | 48d897f65f2ea0ba2c2d0871cdeaa64bcd4c50e4 (patch) | |
tree | 3e9d4457df1c429f5602fecbe3384c07cdcfb8bc | |
parent | 01a402e4ec3239f84756b290dc60e56bedb0c79f (diff) | |
download | gstreamer-plugins-bad-48d897f65f2ea0ba2c2d0871cdeaa64bcd4c50e4.tar.gz |
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.
-rw-r--r-- | sys/nvdec/meson.build | 5 | ||||
-rw-r--r-- | sys/nvenc/meson.build | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/nvdec/meson.build b/sys/nvdec/meson.build index 09c60ecd5..016c3dcac 100644 --- a/sys/nvdec/meson.build +++ b/sys/nvdec/meson.build @@ -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 diff --git a/sys/nvenc/meson.build b/sys/nvenc/meson.build index 2a6739f88..88d3929fd 100644 --- a/sys/nvenc/meson.build +++ b/sys/nvenc/meson.build @@ -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 |