From 738dadadc9055698b4159c407d5ad779104326ff Mon Sep 17 00:00:00 2001 From: thunder2 Date: Thu, 3 Sep 2015 16:33:50 +0200 Subject: [PATCH] Fixed Windows compile of VOIP. --- plugins/VOIP/VOIP.pro | 3 +++ plugins/VOIP/gui/VideoProcessor.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 86a716309..e560a8501 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -24,6 +24,9 @@ linux-* { } win32 { + # ffmpeg + QMAKE_CXXFLAGS += -D__STDC_CONSTANT_MACROS + LIBS_DIR = $$PWD/../../../libs LIBS += -L"$$LIBS_DIR/lib/opencv" diff --git a/plugins/VOIP/gui/VideoProcessor.cpp b/plugins/VOIP/gui/VideoProcessor.cpp index a0084ea18..20aca0410 100644 --- a/plugins/VOIP/gui/VideoProcessor.cpp +++ b/plugins/VOIP/gui/VideoProcessor.cpp @@ -10,7 +10,11 @@ #include "QVideoDevice.h" #include +#include +#if defined(__MINGW32__) +#define memalign _aligned_malloc +#endif //MINGW extern "C" { #include