Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 21:34:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #91 from AsamK/fix_opensuse_compile

Browse Source 
Fix opensuse compile
This commit is contained in:
Cyril Soler 2015-09-04 13:48:58 -04:00
commit 7385dd12ac
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/VOIP/VOIP.pro
View File

@ -19,8 +19,12 @@ INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
#################################### Windows ##################################### #################################### Windows #####################################
linux-* { linux-* {
INCLUDEPATH += /usr/include CONFIG += link_pkgconfig
LIBS += $$system(pkg-config --libs opencv)
# Necessary for openSUSE
PKGCONFIG += libavcodec libavutil
PKGCONFIG += opencv
} }
win32 { win32 {
@ -100,4 +104,4 @@ TRANSLATIONS += \
lang/VOIP_tr.ts \ lang/VOIP_tr.ts \
lang/VOIP_zh_CN.ts lang/VOIP_zh_CN.ts
LIBS += -lspeex -lspeexdsp -lavformat -lavcodec -lavutil LIBS += -lspeex -lspeexdsp -lavcodec -lavutil

8
plugins/VOIP/gui/VideoProcessor.cpp
View File

@ -20,11 +20,11 @@ extern "C" {
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <libavutil/channel_layout.h> //#include <libavutil/channel_layout.h>
#include <libavutil/common.h> //#include <libavutil/common.h>
#include <libavutil/imgutils.h> #include <libavutil/imgutils.h>
#include <libavutil/mathematics.h> //#include <libavutil/mathematics.h>
#include <libavutil/samplefmt.h> //#include <libavutil/samplefmt.h>
} }
//#define DEBUG_MPEG_VIDEO 1 //#define DEBUG_MPEG_VIDEO 1