From 661453653c039659d69263118d71b0748eb6018b Mon Sep 17 00:00:00 2001 From: thunder2 Date: Fri, 4 Sep 2015 01:00:55 +0200 Subject: [PATCH 1/2] Added register of codecs to VOIP. --- plugins/VOIP/VOIPPlugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/VOIP/VOIPPlugin.cpp b/plugins/VOIP/VOIPPlugin.cpp index 08a2dbac3..f914aa81b 100644 --- a/plugins/VOIP/VOIPPlugin.cpp +++ b/plugins/VOIP/VOIPPlugin.cpp @@ -98,6 +98,8 @@ VOIPPlugin::VOIPPlugin() Q_INIT_RESOURCE(VOIP_images); Q_INIT_RESOURCE(VOIP_qss); + + avcodec_register_all(); } void VOIPPlugin::setInterfaces(RsPlugInInterfaces &interfaces) From 0a843989e467dedd9df100bfb4e61cf11612436d Mon Sep 17 00:00:00 2001 From: Phenom Date: Thu, 3 Sep 2015 19:14:30 +0200 Subject: [PATCH 2/2] Fix VOIP compilation with recent libavutil-dev package. /usr/include/libavutil/common.h error 'UINT64C' was not declared in this scope. --- plugins/VOIP/VOIP.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index e560a8501..660a17221 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -24,8 +24,6 @@ linux-* { } win32 { - # ffmpeg - QMAKE_CXXFLAGS += -D__STDC_CONSTANT_MACROS LIBS_DIR = $$PWD/../../../libs 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 } +# ffmpeg (and libavutil: https://github.com/ffms/ffms2/issues/11) +QMAKE_CXXFLAGS += -D__STDC_CONSTANT_MACROS + QMAKE_CXXFLAGS *= -Wall SOURCES = VOIPPlugin.cpp \