diff options
| author | Diego Biurrun <diego@biurrun.de> | 2017-09-23 17:05:00 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-10-12 20:04:15 +0200 |
| commit | 3613063e87307e5421707aa2ffb22054ad5d62b8 (patch) | |
| tree | 95af9a67e3c6294fd1802766f8817b798dd8c7dd /configure | |
| parent | 8594ec3dd59ed8ec303ca62587aaaf3045fce676 (diff) | |
| download | ffmpeg-3613063e87307e5421707aa2ffb22054ad5d62b8.tar.gz | |
configure: Simplify nvenc check (and move it to the correct spot)
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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 |