Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
4503d938
Commit
4503d938
authored
10 years ago
by
Adrien Béraud
Committed by
Gerrit Code Review
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
contrib: fix android libav deps
Refs #70083 Change-Id: Iba3305ee2e4dc634c6879db7e92ed9dd484a9336
parent
992e1faa
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/libav/rules.mak
+11
-9
11 additions, 9 deletions
contrib/src/libav/rules.mak
with
11 additions
and
9 deletions
contrib/src/libav/rules.mak
+
11
−
9
View file @
4503d938
...
...
@@ -28,15 +28,13 @@ LIBAVCONF += \
--enable-parser
=
h263
\
--enable-parser
=
h264
\
--enable-parser
=
mpeg4video
\
--enable-parser
=
opus
\
--enable-parser
=
vp8
--enable-parser
=
opus
#librairies
LIBAVCONF
+=
\
--enable-libx264
\
--enable-libopus
\
--enable-libspeex
\
--enable-libvpx
--enable-libspeex
#encoders/decoders
LIBAVCONF
+=
\
...
...
@@ -54,20 +52,24 @@ LIBAVCONF += \
--enable-decoder
=
libopus
\
--enable-encoder
=
mpeg4
\
--enable-decoder
=
mpeg4
\
--enable-encoder
=
libvpx_vp8
\
--enable-decoder
=
vp8
\
--enable-encoder
=
h263
\
--enable-decoder
=
h263
\
--enable-encoder
=
libspeex
\
--enable-decoder
=
libspeex
# Linux
ifdef
HAVE_
LINUX
if
n
def
HAVE_
ANDROID
LIBAVCONF
+=
\
--enable-x11grab
--enable-parser
=
vp8
\
--enable-libvpx
\
--enable-encoder
=
libvpx_vp8
\
--enable-decoder
=
vp8
endif
DEPS_libav
=
zlib x264 vpx
$(
DEPS_vpx
)
DEPS_libav
=
zlib x264 opus speex
ifndef
HAVE_ANDROID
DEPS_libav
+=
vpx
$(
DEPS_vpx
)
endif
ifdef
HAVE_CROSS_COMPILE
LIBAVCONF
+=
--enable-cross-compile
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment