diff options
Diffstat (limited to 'pjmedia/src/pjmedia-codec/gsm')
-rw-r--r-- | pjmedia/src/pjmedia-codec/gsm/proto.h | 5 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/gsm/rpe.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia-codec/gsm/proto.h b/pjmedia/src/pjmedia-codec/gsm/proto.h index 2851c086..2caa0154 100644 --- a/pjmedia/src/pjmedia-codec/gsm/proto.h +++ b/pjmedia/src/pjmedia-codec/gsm/proto.h @@ -20,6 +20,11 @@ #ifdef _NO_PROTO # undef NeedFunctionPrototypes #endif +
+/* PJMEDIA: always use NeedFunctionPrototypes */
+#ifndef NeedFunctionPrototypes
+# define NeedFunctionPrototypes 1
+#endif
#undef P /* gnu stdio.h actually defines this... */ #undef P0 diff --git a/pjmedia/src/pjmedia-codec/gsm/rpe.c b/pjmedia/src/pjmedia-codec/gsm/rpe.c index eda4f18e..90563dbe 100644 --- a/pjmedia/src/pjmedia-codec/gsm/rpe.c +++ b/pjmedia/src/pjmedia-codec/gsm/rpe.c @@ -298,7 +298,7 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out), temp = exp + 5; assert(temp <= 11 && temp >= 0); - xmaxc = gsm_add( SASR(xmax, temp), exp << 3 ); + xmaxc = gsm_add( (word)SASR(xmax, temp), (word)(exp << 3) ); /* Quantizing and coding of the xM[0..12] RPE sequence * to get the xMc[0..12] |