diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-16 18:59:25 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-19 12:25:36 +0100 |
| commit | c7bbc6cd7a7e26c6c6f26e1b06f8ce354c7a1a46 (patch) | |
| tree | 615a0883528596c2509d03571496c7cd1f343658 /libavcodec | |
| parent | 918d0584a452bf76264e717006f2cfc40b0de21f (diff) | |
| download | ffmpeg-c7bbc6cd7a7e26c6c6f26e1b06f8ce354c7a1a46.tar.gz | |
mpegaudio: merge two #if CONFIG_FLOAT blocks
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegaudio.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 8c6d6ef066..5929db8687 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -63,20 +63,17 @@ #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 \ |