Revert "contrib: ffmpeg: fix OSX linking with vda enabled"

[vlc] / contrib / src / ffmpeg / rules.mak

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index c9bbea8c63d69d17f4ebfb290417003b8621115a..45dc3798af798cc39b97585ec3be760f68ac1b1c 100644 (file)
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -17,6 +17,7 @@ FFMPEGCONF = \
        --disable-ffserver \
        --disable-ffmpeg \
        --disable-ffplay \
+       --disable-avconv \
        --disable-devices \
        --disable-protocols \
        --disable-avfilter \
@@ -58,7 +59,6 @@ endif
 ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
-DEPS_ffmpeg += yasm $(DEPS_yasm)
 endif
 
 # Linux
@@ -68,19 +68,16 @@ endif
 
 # Windows
 ifdef HAVE_WIN32
+DEPS_ffmpeg += directx
 FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
 FFMPEGCONF += --enable-w32threads \
        --disable-bzlib --disable-bsfs \
-       --disable-decoder=dca --disable-encoder=vorbis
+       --disable-decoder=dca --disable-encoder=vorbis \
+       --enable-dxva2
 
 ifdef HAVE_WIN64
-FFMPEGCONF += --disable-dxva2
-
 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
 else # !WIN64
-FFMPEGCONF += --enable-dxva2
-DEPS_ffmpeg += directx
-
 FFMPEGCONF+= --cpu=i686 --arch=x86
 endif
 else
@@ -113,12 +110,9 @@ FFMPEG_VERSION := git
        touch $@
 
 ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
-       rm -Rf ffmpeg-git
-       mkdir -p ffmpeg-git
-       zcat "$<" | (cd ffmpeg-git && tar xv --strip-components=1)
-ifdef HAVE_WIN64
-       $(APPLY) $(SRC)/ffmpeg/ffmpeg-win64.patch
-endif
+       rm -Rf $@ $@-git
+       mkdir -p $@-git
+       $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 ifdef HAVE_WIN32
        sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
 endif