From c7bbc6cd7a7e26c6c6f26e1b06f8ce354c7a1a46 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Mon, 16 May 2011 18:59:25 +0100 Subject: mpegaudio: merge two #if CONFIG_FLOAT blocks Signed-off-by: Mans Rullgard --- libavcodec/mpegaudio.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libavcodec/mpegaudio.h') diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 8c6d6ef066..5929db8687 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -62,21 +62,18 @@ #define FIX(a) ((int)((a) * FRAC_ONE)) -#if CONFIG_FLOAT -typedef float OUT_INT; -#else -typedef int16_t OUT_INT; -#endif - #if CONFIG_FLOAT # define INTFLOAT float typedef float MPA_INT; +typedef float OUT_INT; #elif FRAC_BITS <= 15 # define INTFLOAT int typedef int16_t MPA_INT; +typedef int16_t OUT_INT; #else # define INTFLOAT int typedef int32_t MPA_INT; +typedef int16_t OUT_INT; #endif #define MPA_DECODE_HEADER \ -- cgit v1.2.3