diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-16 17:13:23 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-16 17:49:25 +0100 |
| commit | 92ea249d7db4baf64680f412c6bd99ff85860723 (patch) | |
| tree | db36d909dd2db99e1d8946104ba33450c665b777 /libavcodec | |
| parent | 5026f946fda58b209334a40319af7c42ceb985fe (diff) | |
| download | ffmpeg-92ea249d7db4baf64680f412c6bd99ff85860723.tar.gz | |
mpegaudio: remove OUT_MIN/MAX macros
These macros are no longer needed after the s32 output was removed.
Change the relevant code to use av_clip_int16() instead of using
explicit limits.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegaudio.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index f12b897e23..47d10e91fa 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -70,8 +70,6 @@ typedef float OUT_INT; #define OUT_FMT AV_SAMPLE_FMT_FLT #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 AV_SAMPLE_FMT_S16 #endif diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 7fd6bd2dc6..10a63c57be 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -490,7 +490,7 @@ static inline int round_sample(int64_t *sum) int sum1; sum1 = (int)((*sum) >> OUT_SHIFT); *sum &= (1<<OUT_SHIFT)-1; - return av_clip(sum1, OUT_MIN, OUT_MAX); + return av_clip_int16(sum1); } # define MULS(ra, rb) MUL64(ra, rb) |