Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 18c00089: Merge "Misc fixes for sim-eng build." into gingerbread

Browse Source 
Merge commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb' into gingerbread-plus-aosp

* commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb':
  Misc fixes for sim-eng build.
This commit is contained in:
Chung-yih Wang
2010-10-06 01:52:53 -07:00
committed by Android Git Automerger
parent 2bd6afed6c 18c000896f
commit 4790a2e243
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
voip/jni/rtp/AmrCodec.cpp
View File

@@ -73,7 +73,7 @@ int AmrCodec::set(int sampleRate, const char *fmtp)
} }
// Handle mode-set and octet-align. // Handle mode-set and octet-align.
char *modes = strcasestr(fmtp, "mode-set="); char *modes = (char*)strcasestr(fmtp, "mode-set=");
if (modes) { if (modes) {
mMode = 0; mMode = 0;
mModeSet = 0; mModeSet = 0;

1
voip/jni/rtp/EchoSuppressor.cpp
View File

@@ -15,6 +15,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <stdint.h> #include <stdint.h>
#include <math.h> #include <math.h>