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

Merge branch 'master' of https://github.com/RetroShare/RetroShare

Browse Source
This commit is contained in:
defnax 2015-09-05 00:16:07 +02:00
commit e9a5523c54
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -7,7 +7,7 @@ before_install:
- echo $LANG - echo $LANG
- echo $LC_ALL - echo $LC_ALL
- sudo apt-get update - sudo apt-get update
- sudo apt-get install build-essential checkinstall cmake g++ git libavcodec-dev libavformat-dev libbz2-dev libcurl4-openssl-dev libdc1394-22-dev libglib2.0-dev libcv-dev libopencv-highgui-dev libhighgui-dev - sudo apt-get install build-essential checkinstall cmake g++ git libavutil-dev libavcodec-dev libavformat-dev libbz2-dev libcurl4-openssl-dev libdc1394-22-dev libglib2.0-dev libcv-dev libopencv-highgui-dev libhighgui-dev
- sudo apt-get install libgnome-keyring-dev libgstreamer-plugins-base0.10-dev libgstreamer0.10-dev libjasper-dev libjpeg-dev libmicrohttpd-dev libopencv-dev libprotobuf-dev libqt4-dev - sudo apt-get install libgnome-keyring-dev libgstreamer-plugins-base0.10-dev libgstreamer0.10-dev libjasper-dev libjpeg-dev libmicrohttpd-dev libopencv-dev libprotobuf-dev libqt4-dev
- sudo apt-get install libspeex-dev libspeexdsp-dev libsqlite3-dev libssl-dev libswscale-dev - sudo apt-get install libspeex-dev libspeexdsp-dev libsqlite3-dev libssl-dev libswscale-dev
- sudo apt-get install libtbb-dev libtiff4-dev libupnp-dev libv4l-dev libxine-dev libxslt1-dev libxss-dev make pkg-config protobuf-compiler python-dev python-numpy subversion git yasm qtmobility-dev - sudo apt-get install libtbb-dev libtiff4-dev libupnp-dev libv4l-dev libxine-dev libxslt1-dev libxss-dev make pkg-config protobuf-compiler python-dev python-numpy subversion git yasm qtmobility-dev

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