mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 02:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.linphone.org:linphone into daemon

Browse source
This commit is contained in:
Simon Morlat 2015-03-19 17:22:02 +01:00
commit 919e0ff892
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -680,7 +680,7 @@ AC_ARG_ENABLE(lime,
no) lime=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-lime) ;;
esac],
[lime=auto]
[lime=false]
)
if test "$lime" != "false" ; then

5
coreapi/callbacks.c
View file

@ -433,7 +433,10 @@ static void call_ringing(SalOp *h){
}else{
/*accept early media */
if ((call->audiostream && audio_stream_started(call->audiostream))
|| (call->videostream && video_stream_started(call->videostream))) {
#ifdef VIDEO_ENABLED
|| (call->videostream && video_stream_started(call->videostream))
#endif
) {
/*streams already started */
try_early_media_forking(call,md);
#ifdef VIDEO_ENABLED

2
mediastreamer2

@ -1 +1 @@
Subproject commit e45c262db9413d4f84f8a5b623baf19483667f42
Subproject commit a5c3829d290c35c5a7a760019b1b9ad05b1a257c