Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4790a2e2 authored by Chung-yih Wang's avatar Chung-yih Wang Committed by Android Git Automerger
Browse files

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

Merge commit '18c00089' into gingerbread-plus-aosp

* commit '18c00089':
  Misc fixes for sim-eng build.
parents 2bd6afed 18c00089

voip/jni/rtp/AmrCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

voip/jni/rtp/EchoSuppressor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <stdio.h>

#include <string.h>

#include <stdint.h>

#include <math.h>