[FFmpeg-devel] [PATCH 1/2] lavfi/vf_overlay: change variable name to avoid shadowing

[Rodger Combs]

---
 libavfilter/vf_overlay.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 37f19ea..71f4db7 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -401,7 +401,7 @@ static void blend_image(AVFilterContext *ctx,
                         AVFrame *dst, const AVFrame *src,
                         int x, int y)
 {
-    OverlayContext *s = ctx->priv;
+    OverlayContext *ol = ctx->priv;
     int i, imax, j, jmax, k, kmax;
     const int src_w = src->width;
     const int src_h = src->height;
@@ -412,19 +412,19 @@ static void blend_image(AVFilterContext *ctx,
         y >= dst_h || y+src_h < 0)
         return; /* no intersection */
 
-    if (s->main_is_packed_rgb) {
+    if (ol->main_is_packed_rgb) {
         uint8_t alpha;          ///< the amount of overlay to blend on to main
-        const int dr = s->main_rgba_map[R];
-        const int dg = s->main_rgba_map[G];
-        const int db = s->main_rgba_map[B];
-        const int da = s->main_rgba_map[A];
-        const int dstep = s->main_pix_step[0];
-        const int sr = s->overlay_rgba_map[R];
-        const int sg = s->overlay_rgba_map[G];
-        const int sb = s->overlay_rgba_map[B];
-        const int sa = s->overlay_rgba_map[A];
-        const int sstep = s->overlay_pix_step[0];
-        const int main_has_alpha = s->main_has_alpha;
+        const int dr = ol->main_rgba_map[R];
+        const int dg = ol->main_rgba_map[G];
+        const int db = ol->main_rgba_map[B];
+        const int da = ol->main_rgba_map[A];
+        const int dstep = ol->main_pix_step[0];
+        const int sr = ol->overlay_rgba_map[R];
+        const int sg = ol->overlay_rgba_map[G];
+        const int sb = ol->overlay_rgba_map[B];
+        const int sa = ol->overlay_rgba_map[A];
+        const int sstep = ol->overlay_pix_step[0];
+        const int main_has_alpha = ol->main_has_alpha;
         uint8_t *s, *sp, *d, *dp;
 
         i = FFMAX(-y, 0);
@@ -480,7 +480,7 @@ static void blend_image(AVFilterContext *ctx,
             sp += src->linesize[0];
         }
     } else {
-        const int main_has_alpha = s->main_has_alpha;
+        const int main_has_alpha = ol->main_has_alpha;
         if (main_has_alpha) {
             uint8_t alpha;          ///< the amount of overlay to blend on to main
             uint8_t *s, *sa, *d, *da;
@@ -518,8 +518,8 @@ static void blend_image(AVFilterContext *ctx,
             }
         }
         for (i = 0; i < 3; i++) {
-            int hsub = i ? s->hsub : 0;
-            int vsub = i ? s->vsub : 0;
+            int hsub = i ? ol->hsub : 0;
+            int vsub = i ? ol->vsub : 0;
             int src_wp = AV_CEIL_RSHIFT(src_w, hsub);
             int src_hp = AV_CEIL_RSHIFT(src_h, vsub);
             int dst_wp = AV_CEIL_RSHIFT(dst_w, hsub);
-- 
2.8.2