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
b9e5ef42
Commit
b9e5ef42
authored
9 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
contrib: disable x264 on Android
Issue: #78220 Change-Id: Ibc89d02ad226a9ac003ae2adb3a476b3b714d911
parent
ffd2e180
Branches
Branches containing commit
Tags
Tags containing commit
Loading
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/libav/rules.mak
+6
-6
6 additions, 6 deletions
contrib/src/libav/rules.mak
with
6 additions
and
6 deletions
contrib/src/libav/rules.mak
+
6
−
6
View file @
b9e5ef42
...
...
@@ -28,13 +28,11 @@ LIBAVCONF += \
#enable parsers
LIBAVCONF
+=
\
--enable-parser
=
h263
\
--enable-parser
=
h264
\
--enable-parser
=
mpeg4video
\
--enable-parser
=
opus
#librairies
LIBAVCONF
+=
\
--enable-libx264
\
--enable-libopus
\
--enable-libspeex
...
...
@@ -44,8 +42,6 @@ LIBAVCONF += \
--enable-decoder
=
adpcm_g722
\
--enable-encoder
=
rawvideo
\
--enable-decoder
=
rawvideo
\
--enable-encoder
=
libx264
\
--enable-decoder
=
h264
\
--enable-encoder
=
pcm_alaw
\
--enable-decoder
=
pcm_alaw
\
--enable-encoder
=
pcm_mulaw
\
...
...
@@ -76,15 +72,19 @@ LIBAVCONF += \
# Linux
ifndef
HAVE_ANDROID
LIBAVCONF
+=
\
--enable-parser
=
h264
\
--enable-libx264
\
--enable-encoder
=
libx264
\
--enable-decoder
=
h264
\
--enable-parser
=
vp8
\
--enable-libvpx
\
--enable-encoder
=
libvpx_vp8
\
--enable-decoder
=
vp8
endif
DEPS_libav
=
zlib
x264
opus speex
DEPS_libav
=
zlib opus speex
ifndef
HAVE_ANDROID
DEPS_libav
+=
vpx
$(
DEPS_vpx
)
DEPS_libav
+=
vpx
x264
$(
DEPS_vpx
)
endif
ifdef
HAVE_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