diff options
author | Chung-yih Wang <cywang@google.com> | 2010-10-06 01:50:25 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-06 01:50:25 -0700 |
commit | 18c000896f9cc77e790b92f29d4ddc18b213e1fb (patch) | |
tree | 9403c8d33c79bc006da3bf95543b044b596c4722 /voip/jni/rtp | |
parent | b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4 (diff) | |
parent | fb116fbea3b5f4ea725c0c3e82e70fd82e0a45c5 (diff) | |
download | frameworks_base-18c000896f9cc77e790b92f29d4ddc18b213e1fb.zip frameworks_base-18c000896f9cc77e790b92f29d4ddc18b213e1fb.tar.gz frameworks_base-18c000896f9cc77e790b92f29d4ddc18b213e1fb.tar.bz2 |
Merge "Misc fixes for sim-eng build." into gingerbread
Diffstat (limited to 'voip/jni/rtp')
-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 f3ecac2..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. - 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 92015a9..a1a7aed 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 <math.h> |