[FFmpeg-cvslog] configure: Simplify nvenc check (and move it to the correct spot)

Diego Biurrun git at videolan.org
Sat Nov 11 21:43:38 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Sep 23 17:05:00 2017 +0200| [3613063e87307e5421707aa2ffb22054ad5d62b8] | committer: Diego Biurrun

configure: Simplify nvenc check (and move it to the correct spot)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3613063e87307e5421707aa2ffb22054ad5d62b8
---

 configure | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure b/configure
index c061111a28..240410bf19 100755
--- 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



More information about the ffmpeg-cvslog mailing list