* #39101: updated pjsip stack, many android build enhancements.
The main issue here is due to the build system of the stack compared to a pure Android
NDK project. Generating arm and x86 ABI at the same time does not seem to be possible.
diff --git a/jni/pjproject-android/pjmedia/include/pjmedia-videodev/videodev.h b/jni/pjproject-android/pjmedia/include/pjmedia-videodev/videodev.h
index 9ba4982..9bb42e6 100644
--- a/jni/pjproject-android/pjmedia/include/pjmedia-videodev/videodev.h
+++ b/jni/pjproject-android/pjmedia/include/pjmedia-videodev/videodev.h
@@ -1,4 +1,4 @@
-/* $Id: videodev.h 4167 2012-06-15 08:13:43Z ming $ */
+/* $Id: videodev.h 4704 2014-01-16 05:30:46Z ming $ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
@@ -131,7 +131,7 @@
/**
* Device index constants.
*/
-enum
+enum pjmedia_vid_dev_std_index
{
/**
* Constant to denote default capture device
diff --git a/jni/pjproject-android/pjmedia/include/pjmedia/config.h b/jni/pjproject-android/pjmedia/include/pjmedia/config.h
index 666b7ff..cb0c53e 100644
--- a/jni/pjproject-android/pjmedia/include/pjmedia/config.h
+++ b/jni/pjproject-android/pjmedia/include/pjmedia/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h 4577 2013-08-01 04:18:15Z ming $ */
+/* $Id: config.h 4701 2014-01-03 03:44:05Z nanang $ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -914,6 +914,19 @@
/**
+ * Let the library handle libsrtp initialization and deinitialization.
+ * Application may want to disable this and manually perform libsrtp
+ * initialization and deinitialization when it needs to use libsrtp
+ * before the library is initialized or after the library is shutdown.
+ *
+ * By default it is enabled.
+ */
+#ifndef PJMEDIA_LIBSRTP_AUTO_INIT_DEINIT
+# define PJMEDIA_LIBSRTP_AUTO_INIT_DEINIT 1
+#endif
+
+
+/**
* Enable support to handle codecs with inconsistent clock rate
* between clock rate in SDP/RTP & the clock rate that is actually used.
* This happens for example with G.722 and MPEG audio codecs.