Commit graph

5 commits

Author SHA1 Message Date
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
6cd52eb015 enable x264 2011-07-20 16:36:13 +02:00
Jehan Monnier
09640da0c0 start video integration 2011-07-08 18:06:50 +02:00
Jehan Monnier
0bfd331928 start video on ios 2011-06-10 09:30:41 +02:00
Jehan Monnier
97084dfa71 add ffmpeg compilation 2011-06-07 14:47:32 +02:00