diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 21:41:05 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 21:41:05 +0000 |
| commit | 49cdad8d78b0abdfba6dbaeb79a9c8f91dcf3ba4 (patch) | |
| tree | d460c873f42c26e0ab49e0ab0dac240bdfc13317 /libavcodec | |
| parent | e29a95b1b86cfa0ca320267e66d8b49821fc11ad (diff) | |
| download | ffmpeg-49cdad8d78b0abdfba6dbaeb79a9c8f91dcf3ba4.tar.gz | |
simplify: group all the AUDIO_NONSHORT parameters in the same place
Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegaudio.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 6 |
2 files changed, 3 insertions, 5 deletions
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 diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 3ad2c667d2..58e4511283 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) |