From 49cdad8d78b0abdfba6dbaeb79a9c8f91dcf3ba4 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Wed, 14 Jan 2009 21:41:05 +0000
Subject: [PATCH] simplify: group all the AUDIO_NONSHORT parameters in the same
place
Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mpegaudio.h | 2 ++
libavcodec/mpegaudiodec.c | 6 +-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 72872a353e5..e8eb1abd708 100644
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -68,11 +68,13 @@ typedef int32_t OUT_INT;
#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 --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 3ad2c667d2d..58e4511283f 100644
--- 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)
--
GitLab