summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudio.h
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-05-16 17:06:30 +0100
committerMans Rullgard <mans@mansr.com>2011-05-16 17:49:25 +0100
commitbdefbf3e8857d2861d8d57c0ef583fe15a46d1a4 (patch)
tree266c2e41fe4720b5db48b9a6e67fdcf979086487 /libavcodec/mpegaudio.h
parent92ea249d7db4baf64680f412c6bd99ff85860723 (diff)
downloadffmpeg-bdefbf3e8857d2861d8d57c0ef583fe15a46d1a4.tar.gz
mpegaudio: move OUT_FMT macro to mpegaudiodec.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/mpegaudio.h')
-rw-r--r--libavcodec/mpegaudio.h2
1 files changed, 0 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