diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-09 14:51:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-09 14:51:31 -0300 |
| commit | d8e5a4818b19fec90a696190f94d0667914715a3 (patch) | |
| tree | 3d3137e51e2dd22e0b7f1fa01977facb68b13e9e | |
| parent | 6992c806e60df2ce2ad5096e47e9e35befc76abc (diff) | |
| parent | 3d6135eacf3b6a82c3024620c6a28169960464a7 (diff) | |
| download | ffmpeg-d8e5a4818b19fec90a696190f94d0667914715a3.tar.gz | |
Merge commit '3d6135eacf3b6a82c3024620c6a28169960464a7'
* commit '3d6135eacf3b6a82c3024620c6a28169960464a7':
configure: Simplify OMX check
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -2711,6 +2711,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # hardware-accelerated codecs omx_deps="dlopen pthreads" omx_extralibs='$ldl' +omx_rpi_select="omx" qsvdec_select="qsv" qsvenc_select="qsv" vaapi_encode_deps="vaapi" @@ -5895,12 +5896,10 @@ enabled opengl && { check_lib GL/glx.h glXGetProcAddress "-lGL" || check_lib ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" || die "ERROR: opengl not found." } -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 && { use_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl || use_pkg_config openssl openssl/ssl.h SSL_library_init || check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || |