Skip to content

V
vlc-2-2
Commit 48fba020 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contrib/ffmpeg: fixed compilation for OSX and enable vda hardware acceleration by default

parent d32a6bc1
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
contrib/src/ffmpeg/rules.mak
View file @ 48fba020
...@@ -46,7 +46,7 @@ endif ...@@ -46,7 +46,7 @@ endif
ifdef HAVE_CROSS_COMPILE ifdef HAVE_CROSS_COMPILE
FFMPEGCONF += --enable-cross-compile FFMPEGCONF += --enable-cross-compile
ifndef HAVE_IOS ifndef HAVE_DARWIN_OS
FFMPEGCONF += --cross-prefix=$(HOST)- FFMPEGCONF += --cross-prefix=$(HOST)-
endif endif
endif endif
...@@ -89,6 +89,9 @@ ifeq ($(ARCH),arm) ...@@ -89,6 +89,9 @@ ifeq ($(ARCH),arm)
FFMPEGCONF += --enable-pic --as="$(AS)" FFMPEGCONF += --enable-pic --as="$(AS)"
endif endif
endif endif
ifdef HAVE_MACOSX
FFMPEGCONF += --enable-vda
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