Commit 83254e24 authored by Alex Beregszaszi's avatar Alex Beregszaszi

removed unused CONFIG_AUDIO_NONSHORT

Originally committed as revision 4633 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4209fad9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#define WFRAC_BITS 14 /* fractional bits for window */ #define WFRAC_BITS 14 /* fractional bits for window */
#endif #endif
#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) #if defined(USE_HIGHPRECISION)
typedef int32_t OUT_INT; typedef int32_t OUT_INT;
#define OUT_MAX INT32_MAX #define OUT_MAX INT32_MAX
#define OUT_MIN INT32_MIN #define OUT_MIN INT32_MIN
...@@ -329,7 +329,7 @@ static int decode_init(AVCodecContext * avctx) ...@@ -329,7 +329,7 @@ static int decode_init(AVCodecContext * avctx)
static int init=0; static int init=0;
int i, j, k; int i, j, k;
#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) #if defined(USE_HIGHPRECISION)
avctx->sample_fmt= SAMPLE_FMT_S32; avctx->sample_fmt= SAMPLE_FMT_S32;
#else #else
avctx->sample_fmt= SAMPLE_FMT_S16; avctx->sample_fmt= SAMPLE_FMT_S16;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment