Commit bdefbf3e authored by Mans Rullgard's avatar Mans Rullgard

mpegaudio: move OUT_FMT macro to mpegaudiodec.c

Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 92ea249d
...@@ -67,11 +67,9 @@ ...@@ -67,11 +67,9 @@
#if CONFIG_FLOAT #if CONFIG_FLOAT
typedef float OUT_INT; typedef float OUT_INT;
#define OUT_FMT AV_SAMPLE_FMT_FLT
#else #else
typedef int16_t OUT_INT; typedef int16_t OUT_INT;
#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
#define OUT_FMT AV_SAMPLE_FMT_S16
#endif #endif
#if CONFIG_FLOAT #if CONFIG_FLOAT
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
# define MULH3(x, y, s) ((s)*(y)*(x)) # define MULH3(x, y, s) ((s)*(y)*(x))
# define MULLx(x, y, s) ((y)*(x)) # define MULLx(x, y, s) ((y)*(x))
# define RENAME(a) a ## _float # define RENAME(a) a ## _float
# define OUT_FMT AV_SAMPLE_FMT_FLT
#else #else
# define SHR(a,b) ((a)>>(b)) # define SHR(a,b) ((a)>>(b))
# define compute_antialias compute_antialias_integer # define compute_antialias compute_antialias_integer
...@@ -57,6 +58,7 @@ ...@@ -57,6 +58,7 @@
# define MULH3(x, y, s) MULH((s)*(x), y) # define MULH3(x, y, s) MULH((s)*(x), y)
# define MULLx(x, y, s) MULL(x,y,s) # define MULLx(x, y, s) MULL(x,y,s)
# define RENAME(a) a # define RENAME(a) a
# define OUT_FMT AV_SAMPLE_FMT_S16
#endif #endif
/****************/ /****************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment