On Sun, 4 Dec 2016, Diego Biurrun wrote:

---

Switched the order of the checks, as suggested by Luca.

configure | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index e816eb5..455d4fb 100755
--- a/configure
+++ b/configure
@@ -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"
@@ -4685,12 +4686,10 @@ 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 ; } ||
+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; }||
--
2.1.4

I was almost about to say that it seems ok, but it fails one cruicial detail:

After running ./configure --enable-omx-rpi, I get the following in config.h:

#define CONFIG_OMX 1
#define CONFIG_OMX_RPI 1
#define CONFIG_H264_OMX_ENCODER 0
#define CONFIG_MPEG4_OMX_ENCODER 0

With the current master, they all end up as 1 as intended.

// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to