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

Commit 7ff6f97f authored by Chung-yih Wang's avatar Chung-yih Wang
Browse files

resolved conflicts for merge of 4790a2e2 to master 

Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
parents 39b4867d 4790a2e2

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.

    const 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 <string.h>

#include <math.h>