Update to last version

This commit is contained in:
Julien Wadel 2020-03-17 16:49:38 +01:00
parent 1802a968c1
commit d56e9104ac
5 changed files with 7 additions and 6 deletions

View file

@ -72,11 +72,10 @@ option(ENABLE_TOOLS "Enable tools of SDK" NO)
option(ENABLE_STRICT "Build with strict compilator flags e.g. -Wall -Werror" NO)
option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." YES)
option(ENABLE_OPUS "Build mediastreamer2 with the OPUS codec." YES)
if(WIN32 OR APPLE)
option(ENABLE_OPUS "Build mediastreamer2 with the OPUS codec." YES)
else()##Opus crash on Linux. The version for 4.3 is old. We have to use a switch in configuration to select the newest version for desktop.
option(ENABLE_OPUS "Build mediastreamer2 with the OPUS codec." NO)
else()
option(ENABLE_V4L "Ability to capture and display video using libv4l2 or libv4l." YES)
endif()

View file

@ -33,6 +33,7 @@ if [[ -z ${Qt5_DIR} ]]; then
fi
#Creation of folders
rm -rf build-desktop
mkdir -p build-desktop
#Opus crash on Linux. The version for 4.3 is old. We have to use a switch in configuration to select the newest version for desktop.
#SDK building

View file

@ -32,6 +32,7 @@ if [[ -z ${Qt5_DIR} ]]; then
fi
#Creation of folders
rm -rf build-desktop
mkdir -p build-desktop
cd build-desktop

@ -1 +1 @@
Subproject commit 5ab4ceb1dee6e0670b3385c10ecd9a8575b5529e
Subproject commit 760b36867d8200461220d21bbd6e844a21e554dc

View file

@ -247,7 +247,7 @@ private:
shared_ptr<linphone::Buffer> onFileTransferSend (
const shared_ptr<linphone::ChatMessage> &,
const shared_ptr<const linphone::Content> &,
const shared_ptr<linphone::Content> &,
size_t,
size_t
) override {
@ -257,7 +257,7 @@ private:
void onFileTransferProgressIndication (
const shared_ptr<linphone::ChatMessage> &message,
const shared_ptr<const linphone::Content> &,
const shared_ptr<linphone::Content> &,
size_t offset,
size_t
) override {