Mercurial > libavcodec.hg

comparison mpegaudio.h @ 8598:6550218be3b7 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify: group all the AUDIO_NONSHORT parameters in the same place
author aurel
date Wed, 14 Jan 2009 21:41:05 +0000
parents c5349ca95c08
children 5b5ac656cb50
comparison
equal deleted inserted replaced
8597:573d2361d2ec 8598:6550218be3b7
66 #if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT 66 #if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT
67 typedef int32_t OUT_INT; 67 typedef int32_t OUT_INT;
68 #define OUT_MAX INT32_MAX 68 #define OUT_MAX INT32_MAX
69 #define OUT_MIN INT32_MIN 69 #define OUT_MIN INT32_MIN
70 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31) 70 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31)
71 #define OUT_FMT SAMPLE_FMT_S32
71 #else 72 #else
72 typedef int16_t OUT_INT; 73 typedef int16_t OUT_INT;
73 #define OUT_MAX INT16_MAX 74 #define OUT_MAX INT16_MAX
74 #define OUT_MIN INT16_MIN 75 #define OUT_MIN INT16_MIN
75 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) 76 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
77 #define OUT_FMT SAMPLE_FMT_S16
76 #endif 78 #endif
77 79
78 #if FRAC_BITS <= 15 80 #if FRAC_BITS <= 15
79 typedef int16_t MPA_INT; 81 typedef int16_t MPA_INT;
80 #else 82 #else