From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 12 Oct 2005 22:37:42 +0000 (+0000)
Subject: removed unused CONFIG_AUDIO_NONSHORT
X-Git-Tag: v0.5~13526
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83254e245cfc3dedf6821d4bb7f4dc2b60c7438f;p=platform%2Fupstream%2Flibav.git

removed unused CONFIG_AUDIO_NONSHORT

Originally committed as revision 4633 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 708d35536..6587e9aff 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) && 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 decode_init(AVCodecContext * avctx)
     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;