diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-10-09 08:07:55 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2010-10-09 08:07:55 +0800 |
| commit | 7ff6f97f84b3df7d1f2c5e730189d26ba35bc688 (patch) | |
| tree | cdda059f6c31ca2dbe55ee2c291690188de9d934 /voip/jni | |
| parent | 39b4867d483cc9aba36b26a81074d9f606661671 (diff) | |
| parent | 4790a2e243dca827921f70647a7aef41e502293e (diff) | |
| download | frameworks_base-7ff6f97f84b3df7d1f2c5e730189d26ba35bc688.zip frameworks_base-7ff6f97f84b3df7d1f2c5e730189d26ba35bc688.tar.gz frameworks_base-7ff6f97f84b3df7d1f2c5e730189d26ba35bc688.tar.bz2 | |
resolved conflicts for merge of 4790a2e2 to master
Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
Diffstat (limited to 'voip/jni')
| -rw-r--r-- | voip/jni/rtp/AmrCodec.cpp | 2 | ||||
| -rw-r--r-- | voip/jni/rtp/EchoSuppressor.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/voip/jni/rtp/AmrCodec.cpp b/voip/jni/rtp/AmrCodec.cpp index 84c7166..72ee44e 100644 --- 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; diff --git a/voip/jni/rtp/EchoSuppressor.cpp b/voip/jni/rtp/EchoSuppressor.cpp index 2ceebdc..f99bd0a 100644 --- 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> |