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>

diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index f12b897..47d10e9 100644 (file)
--- 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 7fd6bd2..10a63c5 100644 (file)
--- 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)