[FFmpeg-cvslog] swr: add inrermediate sample type for rematrixing

Michael Niedermayer git at videolan.org
Fri Jun 8 22:05:10 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  8 21:54:54 2012 +0200| [dfde3d497e7e315387697c7b13b612a99478e44f] | committer: Michael Niedermayer

swr: add inrermediate sample type for rematrixing

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfde3d497e7e315387697c7b13b612a99478e44f
---

 libswresample/rematrix.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 15e3ead..872722f 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"
 



More information about the ffmpeg-cvslog mailing list