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
a52424ae
Commit
a52424ae
authored
6 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
contrib: don't build x264 on Android
Change-Id: Ie1c2699f547c78a8c1840ee48f23668848cd13b8
parent
020fffd2
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/ffmpeg/rules.mak
+2
-1
2 additions, 1 deletion
contrib/src/ffmpeg/rules.mak
with
2 additions
and
1 deletion
contrib/src/ffmpeg/rules.mak
+
2
−
1
View file @
a52424ae
...
...
@@ -7,7 +7,7 @@ ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavform
PKGS_FOUND
+=
ffmpeg
endif
DEPS_ffmpeg
=
iconv zlib
x264
vpx opus speex
DEPS_ffmpeg
=
iconv zlib vpx opus speex
FFMPEGCONF
=
\
--cc
=
"
$(
CC
)
"
\
...
...
@@ -129,6 +129,7 @@ endif
ifndef
HAVE_ANDROID
FFMPEGCONF
+=
--enable-libx264
DEPS_ffmpeg
+=
x264
endif
ifdef
HAVE_MACOSX
...
...
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