Commit graph

5 commits

Author SHA1 Message Date
Jehan Monnier
70b09a2694 add *addvideo* button 2011-11-21 18:17:36 +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
Pierre-Eric Pelloux-Prayer
dbd4b9a0ff ios: enable vp8 video codec 2011-08-16 13:11:14 +02:00
Jehan Monnier
6cd52eb015 enable x264 2011-07-20 16:36:13 +02:00
Jehan Monnier
bbfd7e9572 video integration 2011-07-12 10:38:17 +02:00