Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'

[ffmpeg] / libavfilter / vf_sab.c

diff --git a/libavfilter/vf_sab.c b/libavfilter/vf_sab.c
index aa38b533fe17baf81d517be548145b4c59cfb7b4..b8bf1bc2efa943fbd08472cc7c83012ace28dce2 100644 (file)
--- a/libavfilter/vf_sab.c
+++ b/libavfilter/vf_sab.c
@@ -253,8 +253,7 @@ static void blur(uint8_t       *dst, const int dst_linesize,
                 for (dy = 0; dy < radius*2 + 1; dy++) {
                     int dx;
                     int iy = y+dy - radius;
-                    if      (iy < 0)  iy = -iy;
-                    else if (iy >= h) iy = h+h-iy-1;
+                    iy = avpriv_mirror(iy, h-1);
 
                     for (dx = 0; dx < radius*2 + 1; dx++) {
                         const int ix = x+dx - radius;
@@ -265,13 +264,11 @@ static void blur(uint8_t       *dst, const int dst_linesize,
                 for (dy = 0; dy < radius*2+1; dy++) {
                     int dx;
                     int iy = y+dy - radius;
-                    if      (iy <  0) iy = -iy;
-                    else if (iy >= h) iy = h+h-iy-1;
+                    iy = avpriv_mirror(iy, h-1);
 
                     for (dx = 0; dx < radius*2 + 1; dx++) {
                         int ix = x+dx - radius;
-                        if      (ix < 0)  ix = -ix;
-                        else if (ix >= w) ix = w+w-ix-1;
+                        ix = avpriv_mirror(ix, w-1);
                         UPDATE_FACTOR;
                     }
                 }