Merge remote-tracking branch 'public/master' into dev_linphone_qt

.gitignore

 WORK
 OUTPUT
 Makefile
+submodules/tunnel
+record_for_lc_*.wav
+.bc_tester_utils.tmp
+prepare.conf.user

.gitmodules

@@ -16,9 +16,6 @@
 [submodule "submodules/msamr"]
 	path = submodules/msamr
 	url = git://git.linphone.org/msamr.git
-[submodule "submodules/msilbc"]
-	path = submodules/msilbc
-	url = git://git.linphone.org/msilbc.git
 [submodule "submodules/msopenh264"]
 	path = submodules/msopenh264
 	url = git://git.linphone.org/msopenh264.git
@@ -28,15 +25,67 @@
 [submodule "submodules/mswasapi"]
 	path = submodules/mswasapi
 	url = git://git.linphone.org/mswasapi.git
-[submodule "submodules/libilbc-rfc3951"]
-	path = submodules/libilbc-rfc3951
-	url = git://git.linphone.org/libilbc-rfc3951.git
 [submodule "submodules/msx264"]
 	path = submodules/msx264
 	url = git://git.linphone.org/msx264.git
 [submodule "submodules/mswebrtc"]
 	path = submodules/mswebrtc
 	url = git://git.linphone.org/mswebrtc.git
+[submodule "submodules/belcard"]
+	path = submodules/belcard
+	url = git://git.linphone.org/belcard.git
+[submodule "submodules/belr"]
+	path = submodules/belr
+	url = git://git.linphone.org/belr.git
 [submodule "submodules/externals/libmatroska-c"]
 	path = submodules/externals/libmatroska-c
 	url = git://git.linphone.org/libmatroska-c.git
+[submodule "submodules/bctoolbox"]
+	path = submodules/bctoolbox
+	url = git://git.linphone.org/bctoolbox.git
+[submodule "submodules/externals/mbedtls"]
+	path = submodules/externals/mbedtls
+	url = git://git.linphone.org/mbedtls.git
+[submodule "submodules/externals/bv16-floatingpoint"]
+	path = submodules/externals/bv16-floatingpoint
+	url = git://git.linphone.org/bv16-floatingpoint.git
+[submodule "submodules/externals/speex"]
+	path = submodules/externals/speex
+	url = git://git.linphone.org/speex.git
+[submodule "submodules/externals/ffmpeg"]
+	path = submodules/externals/ffmpeg
+	url = git://git.linphone.org/ffmpeg.git
+	ignore = dirty
+[submodule "submodules/externals/libvpx"]
+	path = submodules/externals/libvpx
+	url = git://git.linphone.org/libvpx.git
+[submodule "submodules/externals/opus"]
+	path = submodules/externals/opus
+	url = git://git.linphone.org/opus.git
+	ignore = dirty
+[submodule "submodules/externals/gsm"]
+	path = submodules/externals/gsm
+	url = git://git.linphone.org/gsm.git
+[submodule "submodules/externals/srtp"]
+	path = submodules/externals/srtp
+	url = git://git.linphone.org/srtp.git
+[submodule "submodules/externals/antlr3"]
+	path = submodules/externals/antlr3
+	url = git://git.linphone.org/antlr3.git
+[submodule "submodules/externals/v4l-utils"]
+	path = submodules/externals/v4l-utils
+	url = git://linuxtv.org/v4l-utils.git
+[submodule "submodules/externals/libxml2"]
+	path = submodules/externals/libxml2
+	url = git://git.linphone.org/libxml2
+	ignore = dirty
+[submodule "submodules/externals/zlib"]
+	path = submodules/externals/zlib
+	url = git://git.linphone.org/zlib
+	ignore = dirty
+[submodule "submodules/externals/openh264"]
+	path = submodules/externals/openh264
+	url = https://github.com/cisco/openh264
+[submodule "submodules/bcunit"]
+	path = submodules/bcunit
+	url = git://git.linphone.org/bcunit.git

bcg729 @ 23418135

-Subproject commit 91d1206d63e57a78af1d26058052e9d37f0b6f5d
+Subproject commit 23418135d21077bf41e71170179e4e3cb9723f8a

bctoolbox @ d0c16665

+Subproject commit d0c166650a4a39aaae1d5bc17b5ae64639982930

bcunit @ 29c556fa

+Subproject commit 29c556fa8ac1ab21fba1291231ffa8dea43cf32a

belcard @ 633e151d

+Subproject commit 633e151d8a1775e8b4f717158d12bc0c0957c4ed

belle-sip @ ac49ba79

-Subproject commit c130b4eba162cdcc4c03838e5430867f8b418257
+Subproject commit ac49ba799fd9231f1cd7014fe9c061107a832534

belr @ 8a7f0868

+Subproject commit 8a7f0868a7d35f86ff5fa422c7333f113d935e0f

bzrtp @ 2b234b08

-Subproject commit 19923c26888daf96584cfe6468f9c1bb4a63114b
+Subproject commit 2b234b08e6c85babbcd76651ab432b91c76aaff4

cmake-builder @ a0680560

-Subproject commit a370ebc2ea924cfad44ab8d017ac5b1ff162faac
+Subproject commit a0680560f471c2c1dd488f271a501e7e1617ec89

antlr3 @ ac1069cf

+Subproject commit ac1069cf214b15b86272cbc6ded5916d7d2f85ec

bv16-floatingpoint @ 85b27910

+Subproject commit 85b27910607b7e8edcf7c4a5dec1298b5877f4e2

ffmpeg @ f7589590

+Subproject commit f7589590b37ab772f89d996f6b899d8a4daae684

gsm @ 0f8822b5

+Subproject commit 0f8822b5326c76bb9dc4c6b552631f51792c3982

libmatroska-c @ 12efd631

-Subproject commit 9837df79acb64f81670e464665985b09c4d0a994
+Subproject commit 12efd631fbeebafdeb7a870ad0c1ed7931a2d95f

libvpx @ d2b4742a

+Subproject commit d2b4742a04da011adf05a4ea63d041f60e50195a

libxml2 @ c943f708

+Subproject commit c943f708f1853de4eb15e5a94cf0b35d108da87a

mbedtls @ 02d64e46

+Subproject commit 02d64e46be98442e1f8ca001d6d5c62ff48e36a3

openh264 @ 2610ab18

+Subproject commit 2610ab183249aee91862d2ad065f61db89107b34

opus @ 1f22ae37

+Subproject commit 1f22ae379bbcdfa376775db2b9407529fb1fa781

speex @ fc1dd43c

+Subproject commit fc1dd43c3c9d244bca1c300e408ce0373dbd5ed8

submodules/externals/sqlite3/CMakeLists.txt

+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
+
+cmake_minimum_required(VERSION 2.6)
+project(SQLITE3 C)
+
+
+option(ENABLE_STATIC "Build static library (default is shared library)." OFF)
+
+
+set(SOURCE_FILES sqlite3.c)
+if(WIN32)
+	list(APPEND SOURCE_FILES sqlite3.def)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+	add_definitions(
+		-DSQLITE_OS_WINRT=1
+		-DSQLITE_WIN32_FILEMAPPING_API=1
+		-DSQLITE_OMIT_LOAD_EXTENSION
+	)
+endif()
+
+if(ENABLE_STATIC)
+	add_library(sqlite3 STATIC ${SOURCE_FILES})
+else()
+	add_library(sqlite3 SHARED ${SOURCE_FILES})
+	if(MSVC)
+		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+			install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/sqlite3.pdb
+				DESTINATION bin
+				PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+			)
+		endif()
+	endif()
+endif()
+
+install(TARGETS sqlite3
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib
+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+)
+
+
+file(GLOB HEADER_FILES "*.h")
+
+install(FILES ${HEADER_FILES}
+	DESTINATION include
+	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+)

srtp @ d79ae951

+Subproject commit d79ae95126baa3cec83097469e97525a1d9e2d50

v4l-utils @ 92995faa

+Subproject commit 92995faa431fdd247d55b982898a70aa3a339874

zlib @ 91eb77a7

+Subproject commit 91eb77a7c5bfe7b4cc6b722aa96548d7143a9936

libilbc-rfc3951 @ 91b61e39

-Subproject commit 91b61e39fb9c5d3dc78691f3d6e4f1d65c8b0d2a

msamr @ 207ab85b

-Subproject commit 326e8f035d45ff96c1d0072a52c758730727852a
+Subproject commit 207ab85b81fc3d4dda75ee460f4a3107da7e14bc

msilbc @ d8114cbc

-Subproject commit d8114cbce20391b1222861a9276255589c4e0bb6

msopenh264 @ 57dfcd9a

-Subproject commit d2acb63cca728f1efa4c1ffaf52ee0aee55f731f
+Subproject commit 57dfcd9a0d9d0019c780d784682eaaa9763d4a33

mssilk @ 3fbb877e

-Subproject commit 0c10e9f890f8e24b12fff430d559de02a213b032
+Subproject commit 3fbb877ed683ffb1790d0f4f4c1ffa2543491ffa

mswasapi @ 6ce640d3

-Subproject commit cf04af5559222eac11aa4f4a1979ce4ce39cca90
+Subproject commit 6ce640d3a27530e841ae9fdf2508b6890fd34fa8

mswebrtc @ 841ba533

-Subproject commit 27680f2d99e6f431d8fcc433c4120ddf48263578
+Subproject commit 841ba5339da08ebbcb47baf4b17d325d9bedb25f

msx264 @ 0a5c0a89

-Subproject commit 0831ca99e4aed1d98c0766d14b206742030cdf6d
+Subproject commit 0a5c0a89fa05cab2445073c5ba5546f1511b2a78