Ghislain MARY
c0c3d29058
Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel
2012-12-20 08:46:28 +01:00
Ghislain MARY
4aa170c387
Fix x264 build.
2012-12-20 08:45:16 +01:00
Ghislain MARY
9686dce6d3
Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel
2012-12-17 11:49:40 +01:00
Jehan Monnier
c126a5172d
remove armv6 build
...
Conflicts:
README
2012-09-26 16:43:55 +02:00
Jehan Monnier
b226d0de32
fix build for xcode4.4
2012-09-18 15:04:47 +02:00
Jehan Monnier
0cfc20b8da
xcode 4.6/ios6 support
2012-09-18 10:32:00 +02:00
Jehan Monnier
5aa42780c1
Merge remote-tracking branch 'origin/master' into tunnel
...
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
2012-05-14 12:12:09 +02:00
Jehan Monnier
b4ece1c7e1
implement wifi only mode
2012-05-02 09:25:39 +02:00
Simon Morlat
74c7a81c07
fix crash at startup because of missing srtp_shutdown
2012-04-27 17:12:25 +02:00
Simon Morlat
4e2de700fb
Merge branch 'master' into tunnel
...
Conflicts:
.gitmodules
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
submodules/build/builder-iphone-os.mk
2012-03-16 15:50:55 +01:00
Simon Morlat
447556710d
port to Xcode 4.3 (libvpx patch added)
2012-03-13 23:30:16 +01:00
Jehan Monnier
41a2a33666
g729A integration based on bcg729
2012-02-16 15:46:45 +01:00
Pierre-Eric Pelloux-Prayer
17cc55d854
Merge remote-tracking branch 'public/master' into tunnel
...
Conflicts:
Classes/LinphoneUI/LinphoneManager.h
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
nogpl-thirdparties/Settings.bundle/Root.plist
submodules/build/builder-iphone-os.mk
submodules/linphone
2012-02-06 13:22:39 +01:00
Simon Morlat
68bb10b55e
restore tunnel submodule in submodules/, update linphone submodule, update exosip
2012-01-31 13:42:33 +01:00
Guillaume Beraudo
8d81fc2ba1
Multi call / conference tunnel support.
2011-12-20 18:12:40 +01:00
Pierre-Eric Pelloux-Prayer
40783c14e4
Update libvpx
...
And remove patch which isn't necessary anymore.
2011-12-19 11:12:49 +01:00
Pierre-Eric Pelloux-Prayer
d3b45ea79c
vp8: update build script
2011-12-15 14:47:16 +01:00
Pierre-Eric Pelloux-Prayer
e1fe0f0291
iOS: iPad port (UI and VP8 improvements)
...
New xib files, new home screen.
libvpx updated, multithreading enabled
2011-12-15 14:47:14 +01:00
Simon Morlat
e03056ae6e
Merge branch 'master' into tunnel
...
not fully working
Conflicts:
Classes/LinphoneUI/LinphoneManager.h
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
submodules/build/builder-iphone-os.mk
submodules/build/builders.d/openssl.mk
submodules/liblinphone.xcodeproj/project.pbxproj
2011-12-12 18:28:03 +01:00
Jehan Monnier
8a1c3000cd
merge vios IOS with master
2011-11-18 14:23:41 +01:00
Jehan Monnier
0ad82b4cff
Merge remote-tracking branch 'private/dev_videoios'
...
Conflicts:
.gitmodules
Classes/LinphoneAppDelegate.m
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
2011-11-15 10:54:56 +01:00
Jehan Monnier
9f976eb7bb
fix srtp install
2011-11-14 16:51:03 +01:00
Jehan Monnier
51915a4bac
fix srtp build
2011-11-14 15:44:10 +01:00
Jehan Monnier
2b892c2cfb
remove lib silk fromxcode
2011-11-04 14:35:00 +01:00
Guillaume Beraudo
fb2ddd1b33
Silk plugin for iPhone.
2011-11-03 13:44:49 +01:00
Jehan Monnier
fdf3d42b31
fix libvpx build issue
2011-11-03 08:23:05 +01:00
Jehan Monnier
4d8a4470a7
private version 1.0.7.3
2011-11-02 16:31:25 +01:00
Simon Morlat
eecb65d1d4
Merge remote-tracking branch 'public/master' into dev_videoios
...
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
Classes/LinphoneUI/LinphoneUIDelegates.h
Classes/LinphoneUI/UILinphone.h
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
linphonerc
submodules/build/builder-iphone-os.mk
submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-01 22:20:12 +01:00
Jehan Monnier
e15cd59f4a
fix vp8
2011-10-31 18:19:38 +01:00
Simon Morlat
f02f9f38f4
- update linphone and ms2 submodules for rate control
...
- fix build issues
- fix all black video screen
- fix microphone button not restored in initial state
- attempt to disable idle timer, but with limited success...
2011-10-28 22:01:58 +02:00
Guillaume
4b4319a628
Partial commit with changes on Sylvain's Mac.
2011-10-28 16:29:31 +02:00
Simon Morlat
b838ecebd3
Merge branch 'master' into tunnel
...
and fix srtp compilation (arch not set in archives).
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
2011-10-26 23:01:19 +02:00
Jehan Monnier
827bc6bb0e
fix x264 lib not installed
2011-10-26 11:26:26 +02:00
Jehan Monnier
a8688f5012
fix build issue for sdk
2011-10-26 10:39:23 +02:00
Jehan Monnier
db47f93693
fix for silk
2011-10-21 23:11:29 +02:00
Jehan Monnier
1984838e1b
add silk support
2011-10-21 16:05:43 +02:00
Jehan Monnier
04a9435c2a
update linphone/ms2 with silk
2011-10-20 10:21:00 +02:00
Jehan Monnier
ddeaddf92d
Merge remote-tracking branch 'public/master' into dev_videoios
...
IOS migration
Conflicts:
.gitignore
.gitmodules
linphone-Info.plist
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/build/iphone-config.site
submodules/externals/osip
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
2011-10-19 11:36:27 +02:00
Jehan Monnier
df20927668
fix for IOS 5
2011-10-14 18:03:40 +02:00
Jehan Monnier
2635db3b74
fix audio for IOS5
2011-10-14 16:14:54 +02:00
Jehan Monnier
eed3953489
update libvpx repo, update msx264
2011-10-10 12:21:13 +02:00
Guillaume Beraudo
2ec412b969
Srtp version from 1.4.2 to 1.4.4.
...
Required by zrtp.c.
2011-09-09 14:20:33 +02:00
Guillaume Beraudo
5a982c98e4
Fix zrtpcpp CmakeFilesList.txt only once copy
2011-09-08 16:16:23 +02:00
Guillaume Beraudo
08353ff038
Fix second build fail due to zrtp/cmake
...
CMakeFileLists.txt was overwritten for each architecture target.
CMake was then confused as the CMakeFileLists.txt was newer than the
generated Makefile, cache.
CMake would forget the options passed during generation of Makefile,
leading to compilation of unwanted ccRrtp.
2011-09-08 14:19:12 +02:00
Guillaume Beraudo
d50e11ecbf
Fix srtp patch not applying.
2011-09-08 12:37:36 +02:00
Guillaume Beraudo
c288f87bfb
Patches for srtp and zrtp.
2011-09-06 14:51:14 +02:00
Guillaume Beraudo
bbdd908e4a
Don't compile ZRTPCPP when zrtp is disabled.
2011-09-01 11:16:38 +02:00
Guillaume Beraudo
de7f71a1ce
Fix build
2011-08-29 09:11:36 +02:00
Guillaume Beraudo
63745b55fd
Compilation chain for ZRTP (no implementation)
2011-08-26 18:41:46 +02:00
Simon Morlat
4820c3b36d
Implement tunnel server reconnection
...
Merge branch 'master' into tunnel
Conflicts:
linphone.xcodeproj/project.pbxproj
2011-08-20 16:49:18 +02:00
