Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
c2674133
Commit
c2674133
authored
Apr 30, 2016
by
Janne Grunau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "mmaldec: autodetect by default" since it breaks linking on systems without mmal libraries
This reverts commit
33ac77e8
.
parent
33ac77e8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
configure
configure
+3
-4
No files found.
configure
View file @
c2674133
...
...
@@ -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 [
aut
o]
--enable-mmal enable decoding via MMAL [
n
o]
--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,7 +1252,6 @@ EXTERNAL_LIBRARY_LIST="
libxcb_shm
libxcb_xfixes
libxvid
mmal
openssl
x11grab
zlib
...
...
@@ -4623,13 +4622,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
disabled mmal
||
enable
mmal
&&
{
check_lib interface/mmal/mmal.h mmal_port_connect
-lmmal_core
-lmmal_util
-lmmal_vc_client
-lbcm_host
||
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
;
}
||
di
sable mmal
;
}
di
e
"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
||
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment