changeset 2903:59af72b453e3 libavcodec

removed unused CONFIG_AUDIO_NONSHORT
author alex
date Wed, 12 Oct 2005 22:37:42 +0000
parents 3c79bc9f3aa9
children 84404858c529
files mpegaudiodec.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;