---
adds dependencies otherwise ./configure --enable-mmal would leave mmal
enabled even when it's not there

 configure | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index a577b76..628e6ba 100755
--- a/configure
+++ b/configure
@@ -140,9 +140,9 @@ Hardware accelerators:
   --enable-vdpau           enable VDPAU code
 
 Hardware-accelerated decoding/encoding:
+  --disable-mmal           enable decoding via MMAL [auto]
   --enable-cuda            enable dynamically linked CUDA [no]
   --enable-libmfx          enable HW acceleration through libmfx
-  --enable-mmal            enable decoding via MMAL [no]
   --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]
@@ -2165,6 +2165,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
 # hardware-accelerated codecs
 nvenc_deps_any="dlopen LoadLibrary"
 nvenc_extralibs='$ldl'
+mmal_deps="interface_mmal_mmal_h mmal_port_connect"
 omx_deps="dlopen pthreads"
 omx_extralibs='$ldl'
 qsvdec_select="qsv"
@@ -4735,7 +4736,7 @@ if enabled x11grab; then
     require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes
 fi
 
-if enabled mmal ; then
+if ! disabled mmal ; then
     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
 
@@ -4748,7 +4749,7 @@ if enabled mmal ; then
         check_ldflags $raspbian_mmal_ldflags                     &&
         check_lib interface/mmal/mmal.h mmal_port_connect -lmmal_core 
-lmmal_util -lmmal_vc_client -lbcm_host
 
-    enabled mmal_port_connect || die "ERROR: mmal not found"
+    enabled mmal_port_connect && enable mmal
 
     check_code cc interface/mmal/mmal.h "int v = 
MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS" && enable 
MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
 fi
-- 
2.8.1

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

Reply via email to