# HG changeset patch # User michael # Date 1164966412 0 # Node ID 4be0e20c0eebe55af90e7dca40bc78507786129e # Parent c2224aefb923d75a4d06aefffd379422904227f9 cosmetic (prevent name clashes of variables in a macro with surrounding code) diff -r c2224aefb923 -r 4be0e20c0eeb motion_est_template.c --- a/motion_est_template.c Fri Dec 01 07:24:56 2006 +0000 +++ b/motion_est_template.c Fri Dec 01 09:46:52 2006 +0000 @@ -517,11 +517,11 @@ #define CHECK_CLIPED_MV(ax,ay)\ {\ - const int x= ax;\ - const int y= ay;\ - const int x2= FFMAX(xmin, FFMIN(x, xmax));\ - const int y2= FFMAX(ymin, FFMIN(y, ymax));\ - CHECK_MV(x2, y2)\ + const int Lx= ax;\ + const int Ly= ay;\ + const int Lx2= FFMAX(xmin, FFMIN(Lx, xmax));\ + const int Ly2= FFMAX(ymin, FFMIN(Ly, ymax));\ + CHECK_MV(Lx2, Ly2)\ } #define CHECK_MV_DIR(x,y,new_dir)\