diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
| commit | 268ff17cb785c3ae94be0aca31ed8709e149b487 (patch) | |
| tree | 0d8f9f3b52d0430765ef2bfe389cbea1149b4ca8 /configure | |
| parent | cf16b459a873b990efc10d93e9912ab01b8a0fba (diff) | |
| parent | c48456166e95648719a8be8f8613f9dee98205c1 (diff) | |
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
lavc: add MMAL hardware decoder wrapper
Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -266,6 +266,7 @@ External library support: --enable-libzvbi enable teletext support via libzvbi [no] --disable-lzma disable lzma [autodetect] --enable-decklink enable Blackmagick DeckLink I/O support [no] + --enable-mmal enable decoding via MMAL [no] --enable-nvenc enable NVIDIA NVENC support [no] --enable-openal enable OpenAL 1.1 capture support [no] --enable-opencl enable OpenCL code @@ -1408,6 +1409,7 @@ EXTERNAL_LIBRARY_LIST=" libzmq libzvbi lzma + mmal nvenc openal opencl @@ -2301,6 +2303,10 @@ h263_vdpau_hwaccel_select="h263_decoder" h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser" h264_dxva2_hwaccel_deps="dxva2" h264_dxva2_hwaccel_select="h264_decoder" +h264_mmal_decoder_deps="mmal" +h264_mmal_hwaccel_deps="mmal" +h264_mmal_decoder_select="h264_decoder" +h264_mmal_encoder_deps="mmal" h264_qsv_hwaccel_deps="libmfx" h264_vaapi_hwaccel_deps="vaapi" h264_vaapi_hwaccel_select="h264_decoder" @@ -5006,6 +5012,13 @@ enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzmq && require_pkg_config libzmq zmq.h zmq_ctx_new enabled libzvbi && require libzvbi libzvbi.h vbi_decoder_new -lzvbi +enabled 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"; } enabled nvenc && { check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."; } && { check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 5" || die "ERROR: NVENC API version 4 or older is not supported"; } && |