simplify: group all the AUDIO_NONSHORT parameters in the same place

Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 21:41:05 +00:00
parent e29a95b1b8
commit 49cdad8d78
2 changed files with 3 additions and 5 deletions
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -316,11 +316,7 @@ static int decode_init(AVCodecContext * avctx)

    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)