From 3a2e80ecbc893cbe2ae5bfb7282e4588e7ad1fa5 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 8 May 2011 21:44:12 +0100 Subject: 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 --- libavcodec/mpegaudio.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libavcodec/mpegaudio.h') 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 -- cgit v1.2.3