Mercurial > libavcodec.hg

changeset 4248:4be0e20c0eeb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetic (prevent name clashes of variables in a macro with surrounding code)
author michael
date Fri, 01 Dec 2006 09:46:52 +0000
parents c2224aefb923
children 17e04bdf8d69
files motion_est_template.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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)\