ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Apr 5 15:26:49 2015 -0300| [43482bd1a55c093570d035a01b7d284a65e611ef] | committer: Michael Niedermayer
swr/resample: use av_clip functions Signed-off-by: James Almer <jamr...@gmail.com> Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43482bd1a55c093570d035a01b7d284a65e611ef --- libswresample/resample_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c index 7e80ef9..d71efd6 100644 --- a/libswresample/resample_template.c +++ b/libswresample/resample_template.c @@ -53,7 +53,7 @@ # define FELEM_MAX INT32_MAX # define FELEM_MIN INT32_MIN # define OUT(d, v) (v) = ((v) + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\ - (d) = (uint64_t)((v) + 0x80000000) > 0xFFFFFFFF ? ((v)>>63) ^ 0x7FFFFFFF : (v) + (d) = av_clipl_int32(v) #elif defined(TEMPLATE_RESAMPLE_S16) @@ -66,7 +66,7 @@ # define FELEM_MAX INT16_MAX # define FELEM_MIN INT16_MIN # define OUT(d, v) (v) = ((v) + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\ - (d) = (unsigned)((v) + 32768) > 65535 ? ((v)>>31) ^ 32767 : (v) + (d) = av_clip_int16(v) #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
