[FFmpeg-cvslog] mpegaudio: move OUT_FMT macro to mpegaudiodec.c

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon May 16 17:06:30 2011 +0100| [bdefbf3e8857d2861d8d57c0ef583fe15a46d1a4] | committer: Mans Rullgard

mpegaudio: move OUT_FMT macro to mpegaudiodec.c

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

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

 libavcodec/mpegaudio.h    |    2 --
 libavcodec/mpegaudiodec.c |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 47d10e9..2c3f2ec 100644
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -67,11 +67,9 @@
 
 #if CONFIG_FLOAT
 typedef float OUT_INT;
-#define OUT_FMT AV_SAMPLE_FMT_FLT
 #else
 typedef int16_t OUT_INT;
 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
-#define OUT_FMT AV_SAMPLE_FMT_S16
 #endif
 
 #if CONFIG_FLOAT
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 10a63c5..8c42e09 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -47,6 +47,7 @@
 #   define MULH3(x, y, s) ((s)*(y)*(x))
 #   define MULLx(x, y, s) ((y)*(x))
 #   define RENAME(a) a ## _float
+#   define OUT_FMT AV_SAMPLE_FMT_FLT
 #else
 #   define SHR(a,b)       ((a)>>(b))
 #   define compute_antialias compute_antialias_integer
@@ -57,6 +58,7 @@
 #   define MULH3(x, y, s) MULH((s)*(x), y)
 #   define MULLx(x, y, s) MULL(x,y,s)
 #   define RENAME(a)      a
+#   define OUT_FMT AV_SAMPLE_FMT_S16
 #endif
 
 /****************/