[vlc-commits] win64/ffmpeg: enable dxva2

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov  6 17:13:54 2011 -0500| [68e724115d2fdbe82d81eb85d68f2732457d6b36] | committer: Rafaël Carré

win64/ffmpeg: enable dxva2

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

 extras/contrib/src/contrib-src.mak |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 951dd63..f0739b6 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1042,13 +1042,11 @@ endif
 ifdef HAVE_WIN32
 FFMPEGCONF+= --target-os=mingw32 --arch=x86 --enable-memalign-hack
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis \
-			--enable-libmp3lame --enable-w32threads --disable-bsfs
+			--enable-libmp3lame --enable-w32threads --disable-bsfs --enable-dxva2
 ifdef HAVE_WIN64
-FFMPEGCONF += --disable-dxva2
 FFMPEGCONF+= --cpu=athlon64 --arch=x86_64
 else # !WIN64
-FFMPEGCONF += --enable-dxva2 --enable-libvpx
-FFMPEGCONF+= --cpu=i686
+FFMPEGCONF+= --cpu=i686 --enable-libvpx
 endif
 endif