[vlc-commits] contrib: ffmpeg needs to tweak d3d11 headers

Steve Lhomme git at videolan.org
Fri Feb 5 20:02:58 CET 2016


vlc | branch: master | Steve Lhomme <robUx4 at gmail.com> | Sat Jan 30 09:26:51 2016 +0100| [c3e7a13a62a35dd7567388e0ac46cfff930a5448] | committer: Jean-Baptiste Kempf

contrib: ffmpeg needs to tweak d3d11 headers

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/ffmpeg/rules.mak |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3c06eea..3574e0a 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -147,9 +147,12 @@ endif
 
 # Windows
 ifdef HAVE_WIN32
+ifndef HAVE_VISUALSTUDIO
+DEPS_ffmpeg += d3d11
 ifndef HAVE_MINGW_W64
 DEPS_ffmpeg += directx
 endif
+endif
 FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
 FFMPEGCONF += --enable-w32threads --enable-dxva2
 



More information about the vlc-commits mailing list