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

Originally committed as revision 7191 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-12-01 09:46:52 +00:00
parent 98ba1cfaf7
commit ac003d2461

View File

@ -517,11 +517,11 @@ static int qpel_motion_search(MpegEncContext * s,
#define CHECK_CLIPED_MV(ax,ay)\ #define CHECK_CLIPED_MV(ax,ay)\
{\ {\
const int x= ax;\ const int Lx= ax;\
const int y= ay;\ const int Ly= ay;\
const int x2= FFMAX(xmin, FFMIN(x, xmax));\ const int Lx2= FFMAX(xmin, FFMIN(Lx, xmax));\
const int y2= FFMAX(ymin, FFMIN(y, ymax));\ const int Ly2= FFMAX(ymin, FFMIN(Ly, ymax));\
CHECK_MV(x2, y2)\ CHECK_MV(Lx2, Ly2)\
} }
#define CHECK_MV_DIR(x,y,new_dir)\ #define CHECK_MV_DIR(x,y,new_dir)\