summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2016-11-23 10:14:32 -0800
committerwm4 <wm4@nowhere>2016-11-23 20:48:26 +0100
commit3abb6f1fefadc5e8e84966e07857d248a07a7b29 (patch)
treeb7e52c289ea1a230b5d9c5013134e2303bc81624 /video
parent755e9fad2985fbaaa0c23243521ab4c90a3ceb7e (diff)
downloadmpv-3abb6f1fefadc5e8e84966e07857d248a07a7b29.tar.bz2
mpv-3abb6f1fefadc5e8e84966e07857d248a07a7b29.tar.xz
wscript: Fix cuda test to actually work when cuda SDK is not present
The test ended up failing if cuda.h wasn't present, even if cuda.h isn't used during the actual build. This test is attempting to establish if the ffmpeg being built against has dynlink_cuda support. While it might theoretically be possible to build against the older normally-linked-cuda version of ffmpeg, it seems more trouble than it's worth.
Diffstat (limited to 'video')
-rw-r--r--video/out/opengl/cuda_dynamic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/cuda_dynamic.h b/video/out/opengl/cuda_dynamic.h
index d906b6787f..bdac626be5 100644
--- a/video/out/opengl/cuda_dynamic.h
+++ b/video/out/opengl/cuda_dynamic.h
@@ -19,7 +19,7 @@
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined(MPV_CUDA_DYNAMIC_H) && !defined(CUDA_VERSION)
+#ifndef MPV_CUDA_DYNAMIC_H
#define MPV_CUDA_DYNAMIC_H
#include <stdbool.h>