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

contrib: enable x264 on Android 

Change-Id: I92ac1e5a7f772d2440adb522622622829b13b869
parent fa46ac7d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
contrib/src/ffmpeg/rules.mak
+ 2
− 6
View file @ a76800db
...@@ -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 vpx opus speex DEPS_ffmpeg = iconv zlib vpx opus speex x264
FFMPEGCONF = \ FFMPEGCONF = \
--cc="$(CC)" \ --cc="$(CC)" \
...@@ -65,6 +65,7 @@ FFMPEGCONF += \ ...@@ -65,6 +65,7 @@ FFMPEGCONF += \
--enable-libspeex \ --enable-libspeex \
--enable-libopus \ --enable-libopus \
--enable-libvpx \ --enable-libvpx \
--enable-libx264 \
--enable-encoder=libspeex \ --enable-encoder=libspeex \
--enable-decoder=libspeex \ --enable-decoder=libspeex \
--enable-encoder=libopus \ --enable-encoder=libopus \
...@@ -185,11 +186,6 @@ FFMPEGCONF += \ ...@@ -185,11 +186,6 @@ FFMPEGCONF += \
endif endif
endif endif
ifndef HAVE_ANDROID
FFMPEGCONF += --enable-libx264
DEPS_ffmpeg += x264
endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
FFMPEGCONF += \ FFMPEGCONF += \
--enable-avfoundation \ --enable-avfoundation \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment