From 49cdad8d78b0abdfba6dbaeb79a9c8f91dcf3ba4 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 14 Jan 2009 21:41:05 +0000 Subject: 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 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec/mpegaudio.h') diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 72872a353e..e8eb1abd70 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 -- cgit v1.2.3