From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Tue, 5 Sep 2017 16:16:06 +0000 (+0100)
Subject: configure: only enable nvenc if asked, not by default, fixes #4572
X-Git-Tag: v4.2.4~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62a38e9d19277fde22c2cedaf1920df6bd99536;p=thirdparty%2Ftvheadend.git

configure: only enable nvenc if asked, not by default, fixes #4572
---

diff --git a/configure b/configure
index f0b6fa25f..1004b79f9 100755
--- a/configure
+++ b/configure
@@ -495,11 +495,13 @@ if enabled ffmpeg_static; then
 
   # nvenc
   # latest ffmpeg has own code
-  enable nvenc
-  #if enabled nvenc; then
-  #  check_cc_header nvEncodeAPI || \
-  #    die "NVENC library (https://developer.nvidia.com/nvidia-video-codec-sdk) not found"
-  #fi
+  if enabled_or_auto nvenc; then
+    #check_cc_header nvEncodeAPI || \
+    #  die "NVENC library (https://developer.nvidia.com/nvidia-video-codec-sdk) not found"
+    enable nvenc
+  else
+    disable nvenc
+  fi
 
   # qsv
   if enabled qsv; then