highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegaudio: remove OUT_MIN/MAX macros

Browse Source 
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>
This commit is contained in:
Mans Rullgard
2011-05-16 17:13:23 +01:00
parent 5026f946fd
commit 92ea249d7d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegaudio.h
View File

@@ -70,8 +70,6 @@ typedef float OUT_INT;
#define OUT_FMT AV_SAMPLE_FMT_FLT #define OUT_FMT AV_SAMPLE_FMT_FLT
#else #else
typedef int16_t OUT_INT; 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_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
#define OUT_FMT AV_SAMPLE_FMT_S16 #define OUT_FMT AV_SAMPLE_FMT_S16
#endif #endif

2
libavcodec/mpegaudiodec.c
View File

@@ -490,7 +490,7 @@ static inline int round_sample(int64_t *sum)
int sum1; int sum1;
sum1 = (int)((*sum) >> OUT_SHIFT); sum1 = (int)((*sum) >> OUT_SHIFT);
*sum &= (1<<OUT_SHIFT)-1; *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) # define MULS(ra, rb) MUL64(ra, rb)