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

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 6587e9aff6594938684fb56d9daa423272a0c320..708d355360eeb03ff77bc1c28efdddb48c1814d0 100644 (file)
--- 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;