vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue Apr 16 09:55:52 2019 +0200| [99e31dd180d4f0c3da4c38908c3952c66d3754bb] | committer: Steve Lhomme
WIP build > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=99e31dd180d4f0c3da4c38908c3952c66d3754bb --- modules/codec/Makefile.am | 6 +++--- modules/gui/qt/components/simple_preferences.cpp | 1 + modules/hw/d3d11/d3d11_deinterlace.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 3dadf11191..c5f3c46a66 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -268,9 +268,9 @@ libzvbi_plugin_la_SOURCES = codec/zvbi.c libzvbi_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS) $(CFLAGS_zvbi) libzvbi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libzvbi_plugin_la_LIBADD = $(ZVBI_LIBS) $(SOCKET_LIBS) -if HAVE_WIN32 -libzvbi_plugin_la_LIBADD += -lpthreadGC2 -endif +#if HAVE_WIN32 +#libzvbi_plugin_la_LIBADD += -lpthreadGC2 +#endif EXTRA_LTLIBRARIES += libzvbi_plugin.la codec_LTLIBRARIES += $(LTLIBzvbi) diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp index 7a31a6ea6f..0c4615a565 100644 --- a/modules/gui/qt/components/simple_preferences.cpp +++ b/modules/gui/qt/components/simple_preferences.cpp @@ -40,6 +40,7 @@ #include <QSignalMapper> #include <QVBoxLayout> #include <QScrollArea> +#include <QHeaderView> #include <QStyleFactory> #include <QSettings> diff --git a/modules/hw/d3d11/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c index 71482648b8..5ccafe079d 100644 --- a/modules/hw/d3d11/d3d11_deinterlace.c +++ b/modules/hw/d3d11/d3d11_deinterlace.c @@ -39,7 +39,7 @@ #include "../../video_chroma/d3d11_fmt.h" #include "../../video_filter/deinterlace/common.h" -#ifdef __MINGW32__ +#if 0 //def __MINGW32__ typedef UINT D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS; #define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND 0x1 #define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BOB 0x2 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
