From f32d5ebbf7a75ceb88a22d49d3dfa82ab67abfee Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 19 Mar 2015 15:09:19 +0100 Subject: [PATCH 1/2] configure.ac: disable lime by default for yet instead of auto --- configure.ac | 2 +- mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index af33b7c8b..e96de237c 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/mediastreamer2 b/mediastreamer2 index d31227221..e45c262db 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit d31227221aaf0e1a22af14875563e633396a9086 +Subproject commit e45c262db9413d4f84f8a5b623baf19483667f42 From 8f7a1ee5d51858a67d72a71cdceace7634062dff Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 19 Mar 2015 17:21:24 +0100 Subject: [PATCH 2/2] fix audio only build --- coreapi/callbacks.c | 5 ++++- mediastreamer2 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 25e579495..d3ee638ce 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -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 diff --git a/mediastreamer2 b/mediastreamer2 index e45c262db..a5c3829d2 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e45c262db9413d4f84f8a5b623baf19483667f42 +Subproject commit a5c3829d290c35c5a7a760019b1b9ad05b1a257c