diff options
| author | Seungha Yang <seungha.yang@navercorp.com> | 2018-11-22 00:22:25 +0900 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-11-25 23:31:37 +0000 |
| commit | 4e314d6f80515501906599f548e88e2e4f2d9452 (patch) | |
| tree | 45d67abeeeca7b0459aeddefe4c38f9afdcc61b5 /configure.ac | |
| parent | 67a84254aef632f5d765726939544dff014c14ea (diff) | |
| download | gstreamer-plugins-bad-4e314d6f80515501906599f548e88e2e4f2d9452.tar.gz | |
nvdec: Drop dynlink interface and use NVIDIA CODEC SDK instead
dynlink_* was introduced since CUDA Toolkit 9.x but it's deprecated from 10.0.
Instead of using #ifdef hack, shipping nvidia headers of NVIDA CODEC SDK
can make build/code simple
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 556eb7855..5adc154a4 100644 --- a/configure.ac +++ b/configure.ac @@ -959,11 +959,8 @@ AG_GST_CHECK_FEATURE(CUDA, [NVIDIA CUDA API],, [ HAVE_CUDA_H=no HAVE_CUDART_H=no - HAVE_CUDA_DYN_H=no save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CUDA_CFLAGS $save_CPPFLAGS " - AC_CHECK_HEADER([dynlink_cuda.h], [HAVE_CUDA_DYN_H=yes], - AC_MSG_WARN([Could not find dynlink_cuda.h])) AC_CHECK_HEADER([cuda.h], [HAVE_CUDA_H=yes], AC_MSG_WARN([Could not find cuda.h])) AC_CHECK_HEADER([cuda_runtime_api.h], [HAVE_CUDART_H=yes], @@ -985,15 +982,8 @@ AG_GST_CHECK_FEATURE(CUDA, [NVIDIA CUDA API],, [ dnl *** NVDEC *** translit(dnm, m, l) AM_CONDITIONAL(USE_NVDEC, true) AG_GST_CHECK_FEATURE(NVDEC, [nvdec], nvdec, [ - HAVE_NVCUVID_H=no - HAVE_NCUVID_DYN_H=no save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CUDA_CFLAGS $save_CPPFLAGS" - AC_CHECK_HEADER([nvcuvid.h], [HAVE_NVCUVID_H=yes], - AC_MSG_WARN([Could not find nvcuvid.h])) - AC_CHECK_HEADER([dynlink_nvcuvid.h], [HAVE_NVCUVID_DYN_H=yes], - AC_MSG_WARN([Could not find dynlink_nvcuvid.h])) - CPPFLAGS=$save_CPPFLAGS HAVE_NVCUVID=no @@ -1003,12 +993,7 @@ AG_GST_CHECK_FEATURE(NVDEC, [nvdec], nvdec, [ AC_MSG_WARN([Could not find library nvcuvid])) LIBS="$save_LIBS" - AM_CONDITIONAL(USE_DYNLINK_NVDEC, false) - if test "x$HAVE_NVCUVID_DYN_H" = "xyes" -a "x$HAVE_NVCUVID" = "xyes"; then - HAVE_NVDEC=yes - AM_CONDITIONAL(USE_DYNLINK_NVDEC, true) - AC_DEFINE(HAVE_DYNLINK_HEADERS_NVDEC, 1, [Define if dynlink headers for nvdec are available]) - elif test "x$HAVE_NVCUVID_H" = "xyes" -a "x$HAVE_NVCUVID" = "xyes"; then + if test "x$HAVE_NVCUVID" = "xyes"; then HAVE_NVDEC=yes else HAVE_NVDEC=no |