Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
	coreapi/linphonecore.c
	mediastreamer2

diff --cc coreapi/lsd.c
index f22a5b2072776edf9d465ca1f19743a147143a45,f22a5b2072776edf9d465ca1f19743a147143a45..e47023f4ffc94b93e4b7f675ec5c1b956071d670
--- 1/coreapi/lsd.c
--- 2/coreapi/lsd.c
+++ b/coreapi/lsd.c
@@@ -215,7 -215,7 +215,7 @@@ bool_t lsd_player_loop_enabled(const Ls
  void lsd_player_set_gain(LsdPlayer *p, float gain){
        MSAudioMixerCtl gainctl;
        gainctl.pin=p->mixer_pin;
--      gainctl.gain=gain;
++      gainctl.param.gain=gain;
        ms_filter_call_method(p->lsd->mixer,MS_AUDIO_MIXER_SET_INPUT_GAIN,&gainctl);
  }
  

diff --cc mediastreamer2
index 021c5cd8cca603c6e905ec6688a4deefa995358c,af7bb8b24da40d653a89bc61cd7832db773fa48c..5ee91bbafef99fea6e56a31714af4eceaf0d6553
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 021c5cd8cca603c6e905ec6688a4deefa995358c
 -Subproject commit af7bb8b24da40d653a89bc61cd7832db773fa48c
++Subproject commit 5ee91bbafef99fea6e56a31714af4eceaf0d6553