vlc | branch: master | Steve Lhomme <[email protected]> | Sat Jan 30 09:26:51 2016 +0100| [2bf098bb242c863d87bab362f4bbdf18cac1743a] | committer: Jean-Baptiste Kempf
contrib: ffmpeg needs to tweak d3d11 headers Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2bf098bb242c863d87bab362f4bbdf18cac1743a --- 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 3f99eb6..c1666d1 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -151,9 +151,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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
