From a9d986c2ced87d074ba307f9d6f213c5caae88ee Mon Sep 17 00:00:00 2001 From: Nedeljko Babic Date: Mon, 20 Jul 2015 13:36:20 +0200 Subject: avcodec: Minor macro polishing Use macros from aac_defines.h for adding suffixes instead of local macros. Signed-off-by: Nedeljko Babic Signed-off-by: Michael Niedermayer --- libavcodec/sinewin.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'libavcodec/sinewin.h') diff --git a/libavcodec/sinewin.h b/libavcodec/sinewin.h index 5f0a74afa9..27c107ce59 100644 --- a/libavcodec/sinewin.h +++ b/libavcodec/sinewin.h @@ -23,6 +23,7 @@ #include "config.h" #include "libavutil/mem.h" +#include "libavcodec/aac_defines.h" #if CONFIG_HARDCODED_TABLES # define SINETABLE_CONST const @@ -34,28 +35,20 @@ #define USE_FIXED 0 #endif -#if USE_FIXED -#define SINEWIN_SUFFIX(a) a ## _fixed -#define INTFLOAT int -#else -#define SINEWIN_SUFFIX(a) a -#define INTFLOAT float -#endif - #define SINETABLE(size) \ - SINETABLE_CONST DECLARE_ALIGNED(32, INTFLOAT, SINEWIN_SUFFIX(ff_sine_##size))[size] + SINETABLE_CONST DECLARE_ALIGNED(32, INTFLOAT, AAC_RENAME(ff_sine_##size))[size] /** * Generate a sine window. * @param window pointer to half window * @param n size of half window */ -void SINEWIN_SUFFIX(ff_sine_window_init)(INTFLOAT *window, int n); +void AAC_RENAME(ff_sine_window_init)(INTFLOAT *window, int n); /** * initialize the specified entry of ff_sine_windows */ -void SINEWIN_SUFFIX(ff_init_ff_sine_windows)(int index); +void AAC_RENAME(ff_init_ff_sine_windows)(int index); extern SINETABLE( 32); extern SINETABLE( 64); @@ -67,6 +60,6 @@ extern SINETABLE(2048); extern SINETABLE(4096); extern SINETABLE(8192); -extern SINETABLE_CONST INTFLOAT * const SINEWIN_SUFFIX(ff_sine_windows)[14]; +extern SINETABLE_CONST INTFLOAT * const AAC_RENAME(ff_sine_windows)[14]; #endif /* AVCODEC_SINEWIN_H */ -- cgit v1.2.3