[FFmpeg-cvslog] r18744 - trunk/libavcodec/mpegaudiodec.c
mru
subversion
Tue May 5 20:44:07 CEST 2009
Author: mru
Date: Tue May 5 20:44:07 2009
New Revision: 18744
Log:
mpegaudio: use av_clip()
Modified:
trunk/libavcodec/mpegaudiodec.c
Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c Tue May 5 20:25:20 2009 (r18743)
+++ trunk/libavcodec/mpegaudiodec.c Tue May 5 20:44:07 2009 (r18744)
@@ -752,11 +752,7 @@ static inline int round_sample(int *sum)
int sum1;
sum1 = (*sum) >> OUT_SHIFT;
*sum &= (1<<OUT_SHIFT)-1;
- if (sum1 < OUT_MIN)
- sum1 = OUT_MIN;
- else if (sum1 > OUT_MAX)
- sum1 = OUT_MAX;
- return sum1;
+ return av_clip(sum1, OUT_MIN, OUT_MAX);
}
/* signed 16x16 -> 32 multiply add accumulate */
@@ -774,11 +770,7 @@ static inline int round_sample(int64_t *
int sum1;
sum1 = (int)((*sum) >> OUT_SHIFT);
*sum &= (1<<OUT_SHIFT)-1;
- if (sum1 < OUT_MIN)
- sum1 = OUT_MIN;
- else if (sum1 > OUT_MAX)
- sum1 = OUT_MAX;
- return sum1;
+ return av_clip(sum1, OUT_MIN, OUT_MAX);
}
# define MULS(ra, rb) MUL64(ra, rb)
More information about the ffmpeg-cvslog
mailing list