mpegaudio: move OUT_FMT macro to mpegaudiodec.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago · bdefbf3e88
parent 92ea249d7d
commit bdefbf3e88
2 changed files with 2 additions and 2 deletions
--- 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
--- 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

 /****************/