diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-08 21:44:12 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-09 10:12:47 +0100 |
| commit | 3a2e80ecbc893cbe2ae5bfb7282e4588e7ad1fa5 (patch) | |
| tree | f353827985a1459caea94722f714752e7ca2f557 /libavcodec/mpegaudio.h | |
| parent | eeadaa6bc09dbecccfe3d227a336f6cdeba0b39a (diff) | |
mpegaudio: remove CONFIG_AUDIO_NONSHORT
This fake option cannot be enabled by normal means, and the
floating-point decoder should provide the higher quality this
option presumably was intended for.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/mpegaudio.h')
| -rw-r--r-- | libavcodec/mpegaudio.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index fbfddcc5d2..870743ce38 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -35,8 +35,6 @@ #include "dsputil.h" #include "dct.h" -#define CONFIG_AUDIO_NONSHORT 0 - /* max frame size, in samples */ #define MPA_FRAME_SIZE 1152 @@ -73,12 +71,6 @@ #if CONFIG_FLOAT typedef float OUT_INT; #define OUT_FMT AV_SAMPLE_FMT_FLT -#elif CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT -typedef int32_t OUT_INT; -#define OUT_MAX INT32_MAX -#define OUT_MIN INT32_MIN -#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31) -#define OUT_FMT AV_SAMPLE_FMT_S32 #else typedef int16_t OUT_INT; #define OUT_MAX INT16_MAX |