aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-08 21:54:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-08 21:54:54 +0200
commitdfde3d497e7e315387697c7b13b612a99478e44f (patch)
tree9ab1e4a533c5b00311258863a06a8bf0de7d8484
parent718607be28fd1c3cb1d2d7ad7dd589211b93ab3f (diff)
downloadffmpeg-dfde3d497e7e315387697c7b13b612a99478e44f.tar.gz
swr: add inrermediate sample type for rematrixing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswresample/rematrix.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 15e3ead06e..872722ffe4 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -26,6 +26,7 @@
#define R(x) x
#define SAMPLE float
#define COEFF float
+#define INTER float
#define RENAME(x) x ## _float
#include "rematrix_template.c"
#undef SAMPLE
@@ -33,11 +34,13 @@
#undef R
#undef ONE
#undef COEFF
+#undef INTER
#define ONE (1.0)
#define R(x) x
#define SAMPLE double
#define COEFF double
+#define INTER double
#define RENAME(x) x ## _double
#include "rematrix_template.c"
#undef SAMPLE
@@ -45,11 +48,13 @@
#undef R
#undef ONE
#undef COEFF
+#undef INTER
#define ONE (-32768)
#define R(x) (((x) + 16384)>>15)
#define SAMPLE int16_t
#define COEFF int
+#define INTER int
#define RENAME(x) x ## _s16
#include "rematrix_template.c"