Skip to content

V
vlc
Commit df8d46d7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: ffmpeg, neon factorization

parent 2363e18b
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
extras/contrib/src/contrib-src.mak
View file @ df8d46d7
...@@ -959,6 +959,7 @@ FFMPEGCONF = --disable-doc \ ...@@ -959,6 +959,7 @@ FFMPEGCONF = --disable-doc \
--disable-network --disable-network
FFMPEGCONFSMALL = --disable-encoders --disable-muxers FFMPEGCONFSMALL = --disable-encoders --disable-muxers
FFMPEGCONFNEON = --cpu=cortex-a8 --disable-runtime-cpudetect --enable-neon
#Cross-Compilation #Cross-Compilation
ifdef HAVE_CROSS_COMPILE ifdef HAVE_CROSS_COMPILE
...@@ -1023,7 +1024,7 @@ endif ...@@ -1023,7 +1024,7 @@ endif
ifdef HAVE_IOS ifdef HAVE_IOS
FFMPEGCONF += --sysroot=${IOS_SDK_ROOT} FFMPEGCONF += --sysroot=${IOS_SDK_ROOT}
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8 FFMPEGCONF += $(FFMPEGCONFNEON)
else else
FFMPEGCONF += --disable-mmx FFMPEGCONF += --disable-mmx
endif endif
...@@ -1036,12 +1037,15 @@ endif ...@@ -1036,12 +1037,15 @@ endif
ifdef HAVE_MAEMO ifdef HAVE_MAEMO
ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),) ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8 FFMPEGCONF += $(FFMPEGCONFNEON)
endif endif
endif endif
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
FFMPEGCONF+= --disable-encoders --disable-muxers ifdef HAVE_NEON
FFMPEGCONF += $(FFMPEGCONFNEON)
FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
endif
endif endif
ifdef HAVE_UCLIBC ifdef HAVE_UCLIBC
......
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