Skip to content

V
vlc
Commit edd9048b authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contrib/ffmpeg: minor cleanup

parent 2dcf4d9c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
contrib/src/ffmpeg/rules.mak
View file @ edd9048b
...@@ -67,9 +67,7 @@ endif ...@@ -67,9 +67,7 @@ endif
# ARM stuff # ARM stuff
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
ifndef HAVE_DARWIN_OS
FFMPEGCONF += --arch=arm FFMPEGCONF += --arch=arm
endif
ifdef HAVE_NEON ifdef HAVE_NEON
FFMPEGCONF += --enable-neon FFMPEGCONF += --enable-neon
endif endif
...@@ -83,10 +81,8 @@ endif ...@@ -83,10 +81,8 @@ endif
# ARM64 stuff # ARM64 stuff
ifeq ($(ARCH),aarch64) ifeq ($(ARCH),aarch64)
ifndef HAVE_DARWIN_OS
FFMPEGCONF += --arch=aarch64 FFMPEGCONF += --arch=aarch64
endif endif
endif
# MIPS stuff # MIPS stuff
ifeq ($(ARCH),mipsel) ifeq ($(ARCH),mipsel)
...@@ -113,7 +109,6 @@ FFMPEGCONF += --arch=$(ARCH) --target-os=darwin ...@@ -113,7 +109,6 @@ FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
FFMPEGCONF += --cpu=core2 FFMPEGCONF += --cpu=core2
endif endif
endif
ifdef HAVE_IOS ifdef HAVE_IOS
FFMPEGCONF += --enable-pic --extra-ldflags="$(EXTRA_CFLAGS)" FFMPEGCONF += --enable-pic --extra-ldflags="$(EXTRA_CFLAGS)"
ifdef HAVE_NEON ifdef HAVE_NEON
...@@ -123,6 +118,7 @@ endif ...@@ -123,6 +118,7 @@ endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
FFMPEGCONF += --enable-vda FFMPEGCONF += --enable-vda
endif endif
endif
# Linux # Linux
ifdef HAVE_LINUX ifdef HAVE_LINUX
......
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