diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-16 17:06:30 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-16 17:49:25 +0100 |
| commit | bdefbf3e8857d2861d8d57c0ef583fe15a46d1a4 (patch) | |
| tree | 266c2e41fe4720b5db48b9a6e67fdcf979086487 | |
| parent | 92ea249d7db4baf64680f412c6bd99ff85860723 (diff) | |
| download | ffmpeg-bdefbf3e8857d2861d8d57c0ef583fe15a46d1a4.tar.gz | |
mpegaudio: move OUT_FMT macro to mpegaudiodec.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/mpegaudio.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 47d10e91fa..2c3f2ec065 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 10a63c57be..8c42e09666 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 /****************/ |