Skip to content
Snippets Groups Projects
Commit a52424ae authored by Adrien Béraud's avatar Adrien Béraud
Browse files

contrib: don't build x264 on Android 

Change-Id: Ie1c2699f547c78a8c1840ee48f23668848cd13b8
parent 020fffd2
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
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 ...@@ -7,7 +7,7 @@ ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavform
PKGS_FOUND += ffmpeg PKGS_FOUND += ffmpeg
endif endif
DEPS_ffmpeg = iconv zlib x264 vpx opus speex DEPS_ffmpeg = iconv zlib vpx opus speex
FFMPEGCONF = \ FFMPEGCONF = \
--cc="$(CC)" \ --cc="$(CC)" \
...@@ -129,6 +129,7 @@ endif ...@@ -129,6 +129,7 @@ endif
ifndef HAVE_ANDROID ifndef HAVE_ANDROID
FFMPEGCONF += --enable-libx264 FFMPEGCONF += --enable-libx264
DEPS_ffmpeg += x264
endif endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment