[vlc-commits] contribs: ffmpeg, enable dxva2 on win64 (needs recent or fixed headers)

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov  6 18:15:50 2011 -0500| [17d64234825a62974c99e8e43f32384771b3cbd7] | committer: Rafaël Carré

contribs: ffmpeg, enable dxva2 on win64 (needs recent or fixed headers)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17d64234825a62974c99e8e43f32384771b3cbd7
---

 contrib/src/ffmpeg/rules.mak |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 9c9466a..21d1ad0 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -69,19 +69,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