diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 4a3ada62f4..b3e3e4a664 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -25,16 +25,19 @@ #define ONE (1.0) #define R(x) x #define SAMPLE float +#define COEFF float #define RENAME(x) x ## _float #include "rematrix_template.c" #undef SAMPLE #undef RENAME #undef R #undef ONE +#undef COEFF #define ONE (-32768) #define R(x) (((x) + 16384)>>15) #define SAMPLE int16_t +#define COEFF int #define RENAME(x) x ## _s16 #include "rematrix_template.c" diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c index 0c45fc9110..862430e184 100644 --- a/libswresample/rematrix_template.c +++ b/libswresample/rematrix_template.c @@ -19,14 +19,14 @@ */ -static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, SAMPLE coeff1, SAMPLE coeff2, int len){ +static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEFF coeff1, COEFF coeff2, int len){ int i; for(i=0; i