Index: third_party/opus/src/silk/MacroCount.h |
diff --git a/third_party/opus/src/silk/MacroCount.h b/third_party/opus/src/silk/MacroCount.h |
index 834817d058b9e9e4b8e7c244a9ce735278cf3544..78100ffedeb29061809327309599863a4dc4af48 100644 |
--- a/third_party/opus/src/silk/MacroCount.h |
+++ b/third_party/opus/src/silk/MacroCount.h |
@@ -319,14 +319,6 @@ static OPUS_INLINE opus_int32 silk_ADD_POS_SAT32(opus_int64 a, opus_int64 b){ |
return(tmp); |
} |
-#undef silk_ADD_POS_SAT64 |
-static OPUS_INLINE opus_int64 silk_ADD_POS_SAT64(opus_int64 a, opus_int64 b){ |
- opus_int64 tmp; |
- ops_count += 1; |
- tmp = ((((a)+(b)) & 0x8000000000000000LL) ? silk_int64_MAX : ((a)+(b))); |
- return(tmp); |
-} |
- |
#undef silk_LSHIFT8 |
static OPUS_INLINE opus_int8 silk_LSHIFT8(opus_int8 a, opus_int32 shift){ |
opus_int8 ret; |
@@ -699,7 +691,7 @@ return(ret); |
#undef silk_LIMIT_32 |
-static OPUS_INLINE opus_int silk_LIMIT_32(opus_int32 a, opus_int32 limit1, opus_int32 limit2) |
+static OPUS_INLINE opus_int32 silk_LIMIT_32(opus_int32 a, opus_int32 limit1, opus_int32 limit2) |
{ |
opus_int32 ret; |
ops_count += 6; |