Yann Diorcet 0408e3eae8 Merge branch 'master' into bellesip ... Conflicts: .gitmodules Makefile submodules/externals/build/exosip/Android.mk submodules/externals/exosip submodules/linphone		2013-02-06 12:22:28 +01:00
..
antlr3	Merge branch 'master' into bellesip	2013-02-06 12:22:28 +01:00
ffmpeg	Added MJPEG encoder to ffmepg to be able to take snapshots	2012-06-29 09:53:20 +02:00
ffmpeg-no-neon	Add jpeg encoder to no-neon ffmpeg	2012-08-29 11:21:38 +02:00
gsm	put all dependencies in externals	2010-04-07 12:00:32 +02:00
libvpx	Fix Android build	2012-04-03 15:08:31 +02:00
libxml2	Add xml2lpc/lpc2xml support and remote provisioning	2013-02-05 10:04:00 +01:00
libzrtpcpp	Add config.h of zrtpcpp (cmake no more required)	2011-10-13 09:27:57 +02:00
opencore-amr	Fix AMRNB light compilation and use updated msamr codec	2012-01-27 13:57:06 +01:00
speex	New speex repository	2011-11-16 10:53:44 +01:00
srtp	Fix android compilation issue with updated srtp	2012-04-27 17:57:15 +02:00
vo-amrwbenc	Fix AMR-WB integration (Android.mk)	2012-01-26 16:02:20 +01:00
webrtc	Add missing file.	2012-11-15 15:54:48 +01:00
x264	add msx264	2010-11-29 22:12:36 +01:00