From ac003d24615092670ee67b24d40b32ccfb51c583 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 1 Dec 2006 09:46:52 +0000 Subject: [PATCH] cosmetic (prevent name clashes of variables in a macro with surrounding code) Originally committed as revision 7191 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/motion_est_template.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 837d49a7fc..47da2dcd67 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)\