Skip to content

GitLab

Commit a52424ae authored by Adrien Béraud's avatar Adrien Béraud
Browse files
Options

contrib: don't build x264 on Android 

Change-Id: Ie1c2699f547c78a8c1840ee48f23668848cd13b8
parent 020fffd2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
contrib/src/ffmpeg/rules.mak
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment