1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-06 08:08:58 +02:00

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>
This commit is contained in:
Mans Rullgard 2011-05-08 21:44:12 +01:00
parent eeadaa6bc0
commit 3a2e80ecbc

View File

@ -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