Browse Source
mpegaudio: merge two #if CONFIG_FLOAT blocks
Signed-off-by: Mans Rullgard <mans@mansr.com>tags/n0.8
Mans Rullgard
14 years ago
1 changed files with 3 additions and 6 deletions
Unified View
Diff Options
-
+3 -6libavcodec/mpegaudio.h
+ 3
- 6
libavcodec/mpegaudio.h
View File
| @@ -62,21 +62,18 @@ | |||||
| #define FIX(a) ((int)((a) * FRAC_ONE)) | #define FIX(a) ((int)((a) * FRAC_ONE)) | ||||
| #if CONFIG_FLOAT | |||||
| typedef float OUT_INT; | |||||
| #else | |||||
| typedef int16_t OUT_INT; | |||||
| #endif | |||||
| #if CONFIG_FLOAT | #if CONFIG_FLOAT | ||||
| # define INTFLOAT float | # define INTFLOAT float | ||||
| typedef float MPA_INT; | typedef float MPA_INT; | ||||
| typedef float OUT_INT; | |||||
| #elif FRAC_BITS <= 15 | #elif FRAC_BITS <= 15 | ||||
| # define INTFLOAT int | # define INTFLOAT int | ||||
| typedef int16_t MPA_INT; | typedef int16_t MPA_INT; | ||||
| typedef int16_t OUT_INT; | |||||
| #else | #else | ||||
| # define INTFLOAT int | # define INTFLOAT int | ||||
| typedef int32_t MPA_INT; | typedef int32_t MPA_INT; | ||||
| typedef int16_t OUT_INT; | |||||
| #endif | #endif | ||||
| #define MPA_DECODE_HEADER \ | #define MPA_DECODE_HEADER \ | ||||