configure: Simplify nvenc check (and move it to the correct spot)
authorDiego Biurrun <diego@biurrun.de>
Sat, 23 Sep 2017 15:05:00 +0000 (17:05 +0200)
committerDiego Biurrun <diego@biurrun.de>
Thu, 12 Oct 2017 18:04:15 +0000 (20:04 +0200)
configure

index c061111..240410b 100755 (executable)
--- a/configure
+++ b/configure
@@ -4747,6 +4747,7 @@ enabled mmal              && { check_lib mmal interface/mmal/mmal.h mmal_port_co
                                  check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } ||
                                die "ERROR: mmal not found" &&
                                check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
+enabled nvenc             && require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6"
 enabled omx               && require_header OMX_Core.h
 enabled omx_rpi           && { check_header OMX_Core.h ||
                                { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_header OMX_Core.h ; } ||
@@ -4760,11 +4761,6 @@ enabled openssl           && { { check_pkg_config openssl openssl openssl/ssl.h
 
 enabled gnutls            && check_lib gmp gmp.h mpz_export -lgmp
 
-if enabled nvenc; then
-    require_header nvEncodeAPI.h
-    require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6"
-fi
-
 # SDL adds some CFLAGS that should not be part of the general CFLAGS.
 enabled avplay &&
     test_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent