[Ffmpeg-cvslog] r7191 - trunk/libavcodec/motion_est_template.c

[michael]

Author: michael
Date: Fri Dec  1 10:46:52 2006
New Revision: 7191

Modified:
   trunk/libavcodec/motion_est_template.c

Log:
cosmetic (prevent name clashes of variables in a macro with surrounding code)


Modified: trunk/libavcodec/motion_est_template.c
==============================================================================
--- trunk/libavcodec/motion_est_template.c	(original)
+++ trunk/libavcodec/motion_est_template.c	Fri Dec  1 10:46:52 2006
@@ -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)\