Commit 49cdad8d authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

simplify: group all the AUDIO_NONSHORT parameters in the same place

Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e29a95b1
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment