diff --git a/src/engine/media/MT_AmrCodec.cpp b/src/engine/media/MT_AmrCodec.cpp index d0be326e..15f6da14 100644 --- a/src/engine/media/MT_AmrCodec.cpp +++ b/src/engine/media/MT_AmrCodec.cpp @@ -190,7 +190,7 @@ static AmrPayload parseAmrPayload(AmrPayloadInfo& input) AmrFrame frame; frame.mFrameType = FT; - + frame.mSTI = 0; frame.mMode = FT < SID_FT ? FT : 0xFF; frame.mGoodQuality = Q == 1; frame.mTimestamp = input.mCurrentTimestamp; diff --git a/src/libs/ice/CMakeLists.txt b/src/libs/ice/CMakeLists.txt index 5bc4d4e2..026e4c81 100644 --- a/src/libs/ice/CMakeLists.txt +++ b/src/libs/ice/CMakeLists.txt @@ -34,9 +34,9 @@ set (ICE_STACK_SOURCES ICEAddress.cpp ICETime.cpp ICETransactionList.cpp hmac_sha1_impl.h - hmac_sha1_impl.c + hmac_sha1_impl.cpp md5_impl.h - md5_impl.c + md5_impl.cpp ) set (ICE_DEFINES -D_WINSOCK_DEPRECATED_NO_WARNINGS) diff --git a/src/libs/ice/ICEMD5.cpp b/src/libs/ice/ICEMD5.cpp index 837d480f..a77a4c0e 100644 --- a/src/libs/ice/ICEMD5.cpp +++ b/src/libs/ice/ICEMD5.cpp @@ -31,6 +31,7 @@ void ice::md5Bin(const void* inputData, size_t inputSize, void* digest) MD5_Final((unsigned char*)digest, &md5); } #else + #include "md5_impl.h" // Use own MD5 implementation void ice::md5Bin(const void* inputData, size_t inputSize, void* digest) diff --git a/src/libs/ice/hmac_sha1_impl.c b/src/libs/ice/hmac_sha1_impl.cpp similarity index 100% rename from src/libs/ice/hmac_sha1_impl.c rename to src/libs/ice/hmac_sha1_impl.cpp diff --git a/src/libs/ice/md5_impl.c b/src/libs/ice/md5_impl.cpp similarity index 98% rename from src/libs/ice/md5_impl.c rename to src/libs/ice/md5_impl.cpp index 8e4af0a9..880481a4 100644 --- a/src/libs/ice/md5_impl.c +++ b/src/libs/ice/md5_impl.cpp @@ -204,8 +204,8 @@ void md5String(char *input, uint8_t *result){ memcpy(result, ctx.digest, 16); } -void md5File(FILE *file, uint8_t *result){ - char *input_buffer = malloc(1024); +void md5File(FILE *file, uint8_t *result) { + char *input_buffer = (char*)malloc(1024); size_t input_size = 0; MD5Context ctx;