# HG changeset patch # User alex # Date 1129156662 0 # Node ID 59af72b453e34376432cd92fdc8833a9f0753f26 # Parent 3c79bc9f3aa9edbfb5788f0b94b49c741b298d2d removed unused CONFIG_AUDIO_NONSHORT diff -r 3c79bc9f3aa9 -r 59af72b453e3 mpegaudiodec.c --- a/mpegaudiodec.c Sun Oct 09 23:38:52 2005 +0000 +++ b/mpegaudiodec.c Wed Oct 12 22:37:42 2005 +0000 @@ -48,7 +48,7 @@ #define WFRAC_BITS 14 /* fractional bits for window */ #endif -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) +#if defined(USE_HIGHPRECISION) typedef int32_t OUT_INT; #define OUT_MAX INT32_MAX #define OUT_MIN INT32_MIN @@ -329,7 +329,7 @@ static int init=0; int i, j, k; -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) +#if defined(USE_HIGHPRECISION) avctx->sample_fmt= SAMPLE_FMT_S32; #else avctx->sample_fmt= SAMPLE_FMT_S16;