Commit graph

4663 commits

Author SHA1 Message Date
Jehan Monnier
ea45849762 Merge branch 'belle-sip' of ssh://git.linphone.org/linphone-private into belle-sip 2013-06-07 16:37:37 +02:00
Jehan Monnier
8606366b2e Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	mediastreamer2
2013-06-07 16:37:19 +02:00
Jehan Monnier
d7c4864e4e fix compilation issue 2013-06-07 16:33:24 +02:00
Jehan Monnier
2cc6903827 update ms2 with better opus integration 2013-06-07 16:23:07 +02:00
Jehan Monnier
5bf2d283ef update ms2 with better opus integration 2013-06-07 16:23:07 +02:00
Simon Morlat
59b86f49cc fix test 2013-06-06 22:06:37 +02:00
Simon Morlat
8c3fd2d432 adapt java to modifications of info api 2013-06-06 21:39:57 +02:00
Simon Morlat
fbf909e3b0 update oRTP and ms2 2013-06-06 21:03:51 +02:00
Simon Morlat
5183b21761 change info api so that INFO message can only be sent through calls (as requested by the RFC) 2013-06-06 21:01:53 +02:00
Ghislain MARY
01f746a4b2 Add missing files to compile in the Visual Studio project. 2013-06-06 15:41:22 +02:00
Ghislain MARY
c1c4ff6e0a Add missing exports. 2013-06-06 15:32:22 +02:00
Ghislain MARY
e47d66aaa8 Merge branch 'master' of git.linphone.org:linphone into belle-sip 2013-06-06 15:31:15 +02:00
Ghislain MARY
f2738da8d9 Add linphone_core_get_camera_sensor_rotation(). 2013-06-06 15:30:24 +02:00
Ghislain MARY
d1dc89b520 Update ms2 for VP8 fixes. 2013-06-06 15:44:11 +02:00
Ghislain MARY
75f41e680a Add linphone_core_get_camera_sensor_rotation(). 2013-06-06 15:30:24 +02:00
Ghislain MARY
aa0fedfa02 Update ms2 for VP8 fixes. 2013-06-06 15:44:11 +02:00
Simon Morlat
6a87488991 fix warning in gtk app 2013-06-06 11:12:17 +02:00
Simon Morlat
9c72c72415 fix warning in gtk app 2013-06-06 11:12:17 +02:00
Simon Morlat
36e445f97f generic subscribe notify api in progress 2013-06-06 11:01:54 +02:00
Margaux Clerc
0fd44a7a54 Really add strtok in oRTP 2013-06-06 09:35:22 +02:00
Margaux Clerc
14bd5aa252 Really add strtok in oRTP 2013-06-06 09:35:22 +02:00
Jehan Monnier
bcbe504b9e add test 2013-06-05 20:19:46 +02:00
Margaux Clerc
0231328392 Add strtok in ortp for mingw compilation 2013-06-05 14:30:01 +02:00
Margaux Clerc
9a9074efd3 Add strtok in ortp for mingw compilation 2013-06-05 14:30:01 +02:00
Jehan Monnier
fe1cddbfaa no longuer return registration failure in case of first retry 2013-06-04 21:25:52 +02:00
Jehan Monnier
6e3c6551a9 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	NEWS
	coreapi/linphonecore.c
2013-06-03 18:16:28 +02:00
Jehan Monnier
638cff9433 ipdate ms2 to fix build issue when compiling whitout opus 2013-06-03 16:23:58 +02:00
Jehan Monnier
5f0e9b7682 ipdate ms2 to fix build issue when compiling whitout opus 2013-06-03 16:23:58 +02:00
Jehan Monnier
f1eb0ec07f generate rootca.pem at compilation time using mk-ca-bundle.pl from curl which gather trusted certificates from modizilla 2013-05-31 12:03:12 +02:00
Jehan Monnier
a41aa048ea generate rootca.pem at compilation time using mk-ca-bundle.pl from curl which gather trusted certificates from modizilla 2013-05-31 12:03:12 +02:00
Simon Morlat
facaaffdc2 update ms2 for syntax error fixes in configure. 2013-05-30 10:12:31 +02:00
Simon Morlat
c403ad8e22 update ms2 for syntax error fixes in configure. 2013-05-30 10:12:31 +02:00
Simon Morlat
0fc6d3fd95 fix syntax errors in configure.ac and implement --enable-nls on windows 2013-05-29 04:31:38 +02:00
Margaux Clerc
09a5a4ed60 Add zrtp dll in linphone-deps 2013-05-28 15:20:31 +02:00
Margaux Clerc
15b068fd46 Add zrtp dll in linphone-deps 2013-05-28 15:20:31 +02:00
Simon Morlat
2b03816684 update ms2 to remove opus for android 2013-05-27 12:36:42 +02:00
Simon Morlat
74844e0448 add alias parameter in via for Registers
add declarations for new SUBSCRIBE/NOTIFY/PUBLISH api
2013-05-27 12:25:05 +02:00
Jehan Monnier
5355e37750 Merge branch 'master' of git://git.linphone.org/linphone 2013-05-27 11:18:35 +02:00
Jehan Monnier
2f4c187ef8 Merge branch 'master' of git://git.linphone.org/linphone 2013-05-27 11:18:35 +02:00
Simon Morlat
6596c7f4ce add missing sqlite dll 2013-05-27 10:47:45 +02:00
Simon Morlat
0bd44b5c3a add missing sqlite dll 2013-05-27 10:47:45 +02:00
Jehan Monnier
c476796394 update ortp 2013-05-27 08:55:01 +02:00
Jehan Monnier
c223c2f8c0 fix case where auth is present but there neither passwd nor ha1 2013-05-27 08:39:04 +02:00
Simon Morlat
c0336c8597 update ms2 2013-05-27 08:36:48 +02:00
Ghislain MARY
92f4fafe9e Add opus codec. 2013-05-27 08:34:38 +02:00
Simon Morlat
415d0a159e ready for 3.6 release 2013-05-24 18:00:02 +02:00
Simon Morlat
0badecdad0 ready for 3.6 release 2013-05-24 18:00:02 +02:00
Margaux Clerc
ca9e8b9baa Update README.mingw for sqlite3 building 2013-05-24 16:18:11 +02:00
Margaux Clerc
3668dba1a9 Update README.mingw for sqlite3 building 2013-05-24 16:18:11 +02:00
Simon Morlat
5e8f0d1ca3 fix OPTION to be OPTIONS
add allow header in 200Ok for INVITE
2013-05-24 16:13:39 +02:00