[FFmpeg-cvslog] swr/resample: use av_clip_int16 instead of av_clip

Ganesh Ajjanagadde git at videolan.org
Thu Dec 24 20:31:18 CET 2015


ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde at gmail.com> | Wed Dec 23 14:48:40 2015 -0800| [26937fb416cd6fd42c7135b0e5332ba64154aff2] | committer: Ganesh Ajjanagadde

swr/resample: use av_clip_int16 instead of av_clip

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26937fb416cd6fd42c7135b0e5332ba64154aff2
---

 libswresample/resample.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 34eb4c0..7888e57 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -202,7 +202,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
         switch(c->format){
         case AV_SAMPLE_FMT_S16P:
             for(i=0;i<tap_count;i++)
-                ((int16_t*)filter)[ph * alloc + i] = av_clip(lrintf(tab[i] * scale / norm), INT16_MIN, INT16_MAX);
+                ((int16_t*)filter)[ph * alloc + i] = av_clip_int16(lrintf(tab[i] * scale / norm));
             if (tap_count % 2 == 0) {
                 for (i = 0; i < tap_count; i++)
                     ((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int16_t*)filter)[ph * alloc + i];
@@ -210,7 +210,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
             else {
                 for (i = 1; i <= tap_count; i++)
                     ((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-i] =
-                        av_clip(lrintf(tab[i] * scale / (norm - tab[0] + tab[tap_count])), INT16_MIN, INT16_MAX);
+                        av_clip_int16(lrintf(tab[i] * scale / (norm - tab[0] + tab[tap_count])));
             }
             break;
         case AV_SAMPLE_FMT_S32P:



More information about the ffmpeg-cvslog mailing list