From e6885654eb5e904102cf8c5c3d41d6d2a887545c Mon Sep 17 00:00:00 2001 From: Roberto Togni Date: Sat, 15 Oct 2005 16:29:58 +0000 Subject: [PATCH] Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg Reversing approved by patch author Originally committed as revision 4646 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegaudiodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 6587e9aff6..708d355360 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -48,7 +48,7 @@ #define WFRAC_BITS 14 /* fractional bits for window */ #endif -#if defined(USE_HIGHPRECISION) +#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) typedef int32_t OUT_INT; #define OUT_MAX INT32_MAX #define OUT_MIN INT32_MIN @@ -329,7 +329,7 @@ static int decode_init(AVCodecContext * avctx) static int init=0; int i, j, k; -#if defined(USE_HIGHPRECISION) +#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) avctx->sample_fmt= SAMPLE_FMT_S32; #else avctx->sample_fmt= SAMPLE_FMT_S16;