configure.ac

@@ -2237,8 +2237,10 @@ AC_ARG_ENABLE([nvdec], AS_HELP_STRING([--disable-nvdec],
   [disable NVDEC decoder (default auto)]))
 have_nvdec="no"
 AS_IF([test "$enable_nvdec" != "no"], [
-  AC_CHECK_HEADERS([ffnvcodec/dynlink_loader.h], [
+  PKG_CHECK_MODULES([FFNVCODEC], [ffnvcodec], [
     have_nvdec="yes"
+  ], [
+    AC_MSG_WARN([${FFNVCODEC_PKG_ERRORS}: nvdec will not be available.])
   ])
 ])
 AM_CONDITIONAL([HAVE_NVDEC], [test "${have_nvdec}" != "no"])

modules/hw/nvdec/meson.build

-nvdec_dep = disabler()
-if get_option('nvdec').allowed()
-if cc.check_header('ffnvcodec/dynlink_loader.h')
-    nvdec_dep = enabler()
-elif cc.check_header('ffnvcodec/dynlink_loader.h', dependencies: contrib_dep )
-    nvdec_dep = contrib_dep
-endif
-endif
+# nvdec
+nvdec_dep = dependency('ffnvcodec', required: get_option('nvdec'))
+
 vlc_modules += {
     'name' : 'nvdec',
     'sources' : files('nvdec.c', 'hw_pool.c'),