From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 1 Dec 2006 09:46:52 +0000 (+0000)
Subject: cosmetic (prevent name clashes of variables in a macro with surrounding code)
X-Git-Tag: v0.5~10886
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac003d24615092670ee67b24d40b32ccfb51c583;p=platform%2Fupstream%2Flibav.git

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

Originally committed as revision 7191 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 837d49a..47da2dc 100644
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -517,11 +517,11 @@ static int qpel_motion_search(MpegEncContext * s,
 
 #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)\