]> git.sesse.net Git - vlc/blobdiff - contrib/src/ffmpeg/rules.mak
contribs: remove memalign hack on Darwin
[vlc] / contrib / src / ffmpeg / rules.mak
index 36b491c6d46ea601d86309f9d5360dff95033a01..31ef69a7246ae220de163a9cde5a205fe4ab7aaf 100644 (file)
@@ -80,9 +80,6 @@ endif
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
-ifneq ($(findstring $(ARCH),i386 x86_64),)
-FFMPEGCONF += --enable-memalign-hack
-endif
 ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
@@ -99,6 +96,7 @@ endif
 # Linux
 ifdef HAVE_LINUX
 FFMPEGCONF += --target-os=linux --enable-pic
+
 endif
 
 # Windows
@@ -120,12 +118,6 @@ else # !Windows
 FFMPEGCONF += --enable-pthreads
 endif
 
-# Disable mpegvideo-based hwaccel - known broken
-FFMPEGCONF += \
-       $(foreach codec,h263 mpeg1 mpeg2 mpeg4 vc1 wmv3,\
-               $(foreach api,dxva2 vaapi vdpau,\
-                       --disable-hwaccel=$(codec)_$(api)))
-
 # Build
 PKGS += ffmpeg
 ifeq ($(call need_pkg,"libavcodec >= 54.25.0 libavformat >= 53.21.0 libswscale"),)