diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-12-02 12:33:50 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-12-06 08:33:08 +0100 |
| commit | 3d6135eacf3b6a82c3024620c6a28169960464a7 (patch) | |
| tree | 26e47a01792ac8398cc2c0dd2200838686a22a63 | |
| parent | 601f8dde13ccd0e1993b7840a0304fa2cfe53432 (diff) | |
| download | ffmpeg-streaming-3d6135eacf3b6a82c3024620c6a28169960464a7.zip ffmpeg-streaming-3d6135eacf3b6a82c3024620c6a28169960464a7.tar.gz | |
configure: Simplify OMX check
| -rwxr-xr-x | configure | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -2190,6 +2190,7 @@ nvenc_deps_any="dlopen LoadLibrary" nvenc_extralibs='$ldl' omx_deps="dlopen pthreads" omx_extralibs='$ldl' +omx_rpi_select="omx" qsvdec_select="qsv" qsvenc_select="qsv" vaapi_encode_deps="vaapi" @@ -4688,12 +4689,10 @@ enabled mmal && { check_lib interface/mmal/mmal.h mmal_port_connect check_lib 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 omx_rpi && enable omx -enabled omx && { check_header OMX_Core.h || - { ! enabled cross_compile && enabled omx_rpi && { - add_cflags -isystem/opt/vc/include/IL ; } - check_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 ; } || die "ERROR: OpenMAX IL headers not found"; } +enabled omx && { check_header OMX_Core.h || die "ERROR: OpenMAX IL headers not found"; } enabled openssl && { { check_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl || check_pkg_config openssl openssl/ssl.h SSL_library_init; } && { add_cflags $openssl_cflags && add_extralibs $openssl_libs; }|| |
