resolved conflicts for merge of 4790a2e2 to master

Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
2010-10-09 08:07:55 +08:00
parent 39b4867d48 4790a2e243
commit 7ff6f97f84
2 changed files with 2 additions and 1 deletions
--- a/voip/jni/rtp/AmrCodec.cpp
+++ b/voip/jni/rtp/AmrCodec.cpp
@@ -73,7 +73,7 @@ int AmrCodec::set(int sampleRate, const char *fmtp)
    }

    // Handle mode-set and octet-align.
-    const char *modes = strcasestr(fmtp, "mode-set=");
+    char *modes = (char*)strcasestr(fmtp, "mode-set=");
    if (modes) {
        mMode = 0;
        mModeSet = 0;
--- a/voip/jni/rtp/EchoSuppressor.cpp
+++ b/voip/jni/rtp/EchoSuppressor.cpp
@@ -15,6 +15,7 @@
 */

 #include <stdio.h>
+#include <string.h>
 #include <stdint.h>
 #include <string.h>
 #include <math.h>