# HG changeset patch
# User aurel
# Date 1231969265 0
# Node ID 6550218be3b749be5b30075a9aa94dad324c4371
# Parent  573d2361d2ec117c19d3821f0352e102ab2d0671
simplify: group all the AUDIO_NONSHORT parameters in the same place

diff -r 573d2361d2ec -r 6550218be3b7 mpegaudio.h
--- a/mpegaudio.h	Wed Jan 14 21:34:48 2009 +0000
+++ b/mpegaudio.h	Wed Jan 14 21:41:05 2009 +0000
@@ -68,11 +68,13 @@
 #define OUT_MAX INT32_MAX
 #define OUT_MIN INT32_MIN
 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31)
+#define OUT_FMT SAMPLE_FMT_S32
 #else
 typedef int16_t OUT_INT;
 #define OUT_MAX INT16_MAX
 #define OUT_MIN INT16_MIN
 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
+#define OUT_FMT SAMPLE_FMT_S16
 #endif
 
 #if FRAC_BITS <= 15
diff -r 573d2361d2ec -r 6550218be3b7 mpegaudiodec.c
--- a/mpegaudiodec.c	Wed Jan 14 21:34:48 2009 +0000
+++ b/mpegaudiodec.c	Wed Jan 14 21:41:05 2009 +0000
@@ -316,11 +316,7 @@
 
     s->avctx = avctx;
 
-#if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT
-    avctx->sample_fmt= SAMPLE_FMT_S32;
-#else
-    avctx->sample_fmt= SAMPLE_FMT_S16;
-#endif
+    avctx->sample_fmt= OUT_FMT;
     s->error_recognition= avctx->error_recognition;
 
     if(avctx->antialias_algo != FF_AA_FLOAT)