---

Updated according to Martin's feedback.

 configure | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 9cea910..6f23d8f 100755
--- a/configure
+++ b/configure
@@ -2191,6 +2191,7 @@ nvenc_deps_any="cuda 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,11 @@ enabled mmal              && { check_lib 
interface/mmal/mmal.h mmal_port_connect
                                 check_lib interface/mmal/mmal.h 
mmal_port_connect ; } ||
                                die "ERROR: mmal not found"; }
 enabled mmal && 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 ; } ||
-                               die "ERROR: OpenMAX IL headers not found"; }
+enabled omx               && check_header OMX_Core.h || die "ERROR: OpenMAX IL 
headers not found"
+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 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; }||
-- 
2.1.4

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to