[FFmpeg-cvslog] avfilter/vf_maskedclamp: make C version consistent with ASM one

Paul B Mahol git at videolan.org
Sat Feb 8 11:46:46 EET 2020


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Feb  8 10:44:38 2020 +0100| [68416e4ba7e26965fa567249bbec1057f68ca9cf] | committer: Paul B Mahol

avfilter/vf_maskedclamp: make C version consistent with ASM one

In case of undefined behaviour.

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

 libavfilter/vf_maskedclamp.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavfilter/vf_maskedclamp.c b/libavfilter/vf_maskedclamp.c
index b0dc8a3550..52392c4c86 100644
--- a/libavfilter/vf_maskedclamp.c
+++ b/libavfilter/vf_maskedclamp.c
@@ -178,12 +178,8 @@ static void maskedclamp##name(const uint8_t *bbsrc, uint8_t *ddst,
     type *dst = (type *)ddst;                                                     \
                                                                                   \
     for (int x = 0; x < w; x++) {                                                 \
-        if (bsrc[x] < darksrc[x] - undershoot)                                    \
-            dst[x] = darksrc[x] - undershoot;                                     \
-        else if (bsrc[x] > brightsrc[x] + overshoot)                              \
-            dst[x] = brightsrc[x] + overshoot;                                    \
-        else                                                                      \
-            dst[x] = bsrc[x];                                                     \
+        dst[x] = FFMAX(bsrc[x], darksrc[x] - undershoot);                         \
+        dst[x] = FFMIN(dst[x], brightsrc[x] + overshoot);                         \
     }                                                                             \
 }
 



More information about the ffmpeg-cvslog mailing list