mpegaudio: merge two #if CONFIG_FLOAT blocks

Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago · c7bbc6cd7a
parent 918d0584a4
commit c7bbc6cd7a
1 changed files with 3 additions and 6 deletions
--- 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 \