Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-15 17:37:12 -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-04 16:33:43 +02:00
commit 7f8dae93cf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/VOIP/VOIP.pro
View File

@ -24,8 +24,6 @@ linux-* {
} }
win32 { win32 {
# ffmpeg
QMAKE_CXXFLAGS += -D__STDC_CONSTANT_MACROS
LIBS_DIR = $$PWD/../../../libs LIBS_DIR = $$PWD/../../../libs
LIBS += -L"$$LIBS_DIR/lib/opencv" LIBS += -L"$$LIBS_DIR/lib/opencv"
@ -34,6 +32,9 @@ win32 {
LIBS += -lopencv_core$$OPENCV_VERSION -lopencv_highgui$$OPENCV_VERSION -lopencv_imgproc$$OPENCV_VERSION -llibjpeg -llibtiff -llibpng -llibjasper -lIlmImf -lole32 -loleaut32 -luuid -lavicap32 -lavifil32 -lvfw32 -lz LIBS += -lopencv_core$$OPENCV_VERSION -lopencv_highgui$$OPENCV_VERSION -lopencv_imgproc$$OPENCV_VERSION -llibjpeg -llibtiff -llibpng -llibjasper -lIlmImf -lole32 -loleaut32 -luuid -lavicap32 -lavifil32 -lvfw32 -lz
} }
# ffmpeg (and libavutil: https://github.com/ffms/ffms2/issues/11)
QMAKE_CXXFLAGS += -D__STDC_CONSTANT_MACROS
QMAKE_CXXFLAGS *= -Wall QMAKE_CXXFLAGS *= -Wall
SOURCES = VOIPPlugin.cpp \ SOURCES = VOIPPlugin.cpp \

2
plugins/VOIP/VOIPPlugin.cpp
View File

@ -98,6 +98,8 @@ VOIPPlugin::VOIPPlugin()
Q_INIT_RESOURCE(VOIP_images); Q_INIT_RESOURCE(VOIP_images);
Q_INIT_RESOURCE(VOIP_qss); Q_INIT_RESOURCE(VOIP_qss);
avcodec_register_all();
} }
void VOIPPlugin::setInterfaces(RsPlugInInterfaces &interfaces) void VOIPPlugin::setInterfaces(RsPlugInInterfaces &interfaces)