Skip to content

V
vlc
Commit 17d64234 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

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

parent 6fdeb51c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
contrib/src/ffmpeg/rules.mak
View file @ 17d64234
...@@ -69,19 +69,16 @@ endif ...@@ -69,19 +69,16 @@ endif
# Windows # Windows
ifdef HAVE_WIN32 ifdef HAVE_WIN32
DEPS_ffmpeg += directx
FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
FFMPEGCONF += --enable-w32threads \ FFMPEGCONF += --enable-w32threads \
--disable-bzlib --disable-bsfs \ --disable-bzlib --disable-bsfs \
--disable-decoder=dca --disable-encoder=vorbis --disable-decoder=dca --disable-encoder=vorbis \
--enable-dxva2
ifdef HAVE_WIN64 ifdef HAVE_WIN64
FFMPEGCONF += --disable-dxva2
FFMPEGCONF += --cpu=athlon64 --arch=x86_64 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
else # !WIN64 else # !WIN64
FFMPEGCONF += --enable-dxva2
DEPS_ffmpeg += directx
FFMPEGCONF+= --cpu=i686 --arch=x86 FFMPEGCONF+= --cpu=i686 --arch=x86
endif endif
else else
......
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