summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2016-04-14 12:21:27 +0200
committerAnton Khirnov <anton@khirnov.net>2016-04-30 08:34:10 +0200
commit33ac77e850efdfd0e8835950c3d947baffd4df45 (patch)
tree897f8dd5c768e4891f2d27d7bef9c5bdb4b8e483 /configure
parent74beead9bd596180bcac6108548fc0a86d8eb4ae (diff)
mmaldec: autodetect by default
It qualifies as a system library. Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index e395e38b4a..3d236f537b 100755
--- a/configure
+++ b/configure
@@ -142,7 +142,7 @@ Hardware accelerators:
Hardware-accelerated decoding/encoding:
--enable-cuda enable dynamically linked CUDA [no]
--enable-libmfx enable HW acceleration through libmfx
- --enable-mmal enable decoding via MMAL [no]
+ --enable-mmal enable decoding via MMAL [auto]
--enable-nvenc enable encoding via NVENC [no]
--enable-omx enable encoding via OpenMAX IL [no]
--enable-omx-rpi enable encoding via OpenMAX IL for Raspberry Pi [no]
@@ -1252,6 +1252,7 @@ EXTERNAL_LIBRARY_LIST="
libxcb_shm
libxcb_xfixes
libxvid
+ mmal
openssl
x11grab
zlib
@@ -4622,13 +4623,13 @@ enabled libx265 && require_pkg_config x265 x265.h x265_api_get &&
die "ERROR: libx265 version must be >= 57."; }
enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
-enabled mmal && { check_lib interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
+disabled mmal || enable mmal && { check_lib interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
{ ! enabled cross_compile && {
add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline ;
add_extralibs -L/opt/vc/lib/ -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ;
check_lib interface/mmal/mmal.h mmal_port_connect ; }
check_lib interface/mmal/mmal.h mmal_port_connect ; } ||
- die "ERROR: mmal not found"; }
+ disable mmal; }
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 ||