[FFmpeg-cvslog] mpegaudio: merge two #if CONFIG_FLOAT blocks

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon May 16 18:59:25 2011 +0100| [c7bbc6cd7a7e26c6c6f26e1b06f8ce354c7a1a46] | committer: Mans Rullgard

mpegaudio: merge two #if CONFIG_FLOAT blocks

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7bbc6cd7a7e26c6c6f26e1b06f8ce354c7a1a46
---

 libavcodec/mpegaudio.h |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 8c6d6ef..5929db8 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 \