diff --git a/coreapi/upnp.c b/coreapi/upnp.c
index 5684fc270..631d6545b 100644
--- a/coreapi/upnp.c
+++ b/coreapi/upnp.c
@@ -585,7 +585,7 @@ int linphone_upnp_call_process(LinphoneCall *call) {
 	LinphoneCore *lc = call->core;
 	UpnpContext *lupnp = lc->upnp;
 	int ret = -1;
-	LinphoneUpnpState oldState, newState;
+	LinphoneUpnpState oldState = 0, newState = 0;
 
 	if(lupnp == NULL) {
 		return ret;
diff --git a/mediastreamer2 b/mediastreamer2
index 710c3da85..b21f30429 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 710c3da85157d4db17bfce21e7d2b7853377fa4e
+Subproject commit b21f304297319e15fbe0beb3509592022eb8e88a