diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd823a933..a659bea85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,6 +246,7 @@ if(ENABLE_STATIC)
 	list(APPEND LINPHONE_CPPFLAGS "-DLINPHONE_STATIC")
 endif()
 if(LINPHONE_CPPFLAGS)
+	list(REMOVE_DUPLICATES LINPHONE_CPPFLAGS)
 	add_definitions(${LINPHONE_CPPFLAGS})
 endif()
 
diff --git a/mediastreamer2 b/mediastreamer2
index a98176898..452d40be6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a98176898fd2b6ce85d2d9cd3adab99bcfd8e42b
+Subproject commit 452d40be62dfa14b48fb4d2cb21123b93a4dee85