diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 660a17221..013a5c39e 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -19,8 +19,12 @@ INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src #################################### Windows ##################################### linux-* { - INCLUDEPATH += /usr/include - LIBS += $$system(pkg-config --libs opencv) + CONFIG += link_pkgconfig + + # Necessary for openSUSE + PKGCONFIG += libavcodec libavutil + + PKGCONFIG += opencv } win32 { @@ -100,4 +104,4 @@ TRANSLATIONS += \ lang/VOIP_tr.ts \ lang/VOIP_zh_CN.ts -LIBS += -lspeex -lspeexdsp -lavformat -lavcodec -lavutil +LIBS += -lspeex -lspeexdsp -lavcodec -lavutil diff --git a/plugins/VOIP/gui/VideoProcessor.cpp b/plugins/VOIP/gui/VideoProcessor.cpp index 20aca0410..27129216f 100644 --- a/plugins/VOIP/gui/VideoProcessor.cpp +++ b/plugins/VOIP/gui/VideoProcessor.cpp @@ -20,11 +20,11 @@ extern "C" { #include #include -#include -#include +//#include +//#include #include -#include -#include +//#include +//#include } //#define DEBUG_MPEG_VIDEO 1