# HG changeset patch # User rbultje # Date 1277240220 0 # Node ID 2013535ff4e567908986a138e2373548d8665a99 # Parent 8c657be75c1138c9e52e4272386b53cdf11c8e83 Rename PACK4x8() to PACK4UINT8(). diff -r 8c657be75c11 -r 2013535ff4e5 h264pred.c --- a/h264pred.c Tue Jun 22 19:29:03 2010 +0000 +++ b/h264pred.c Tue Jun 22 20:57:00 2010 +0000 @@ -109,7 +109,7 @@ const int lt= src[-1-1*stride]; LOAD_TOP_EDGE LOAD_TOP_RIGHT_EDGE - uint32_t v = PACK4x8((lt + 2*t0 + t1 + 2) >> 2, + uint32_t v = PACK4UINT8((lt + 2*t0 + t1 + 2) >> 2, (t0 + 2*t1 + t2 + 2) >> 2, (t1 + 2*t2 + t3 + 2) >> 2, (t2 + 2*t3 + t4 + 2) >> 2); diff -r 8c657be75c11 -r 2013535ff4e5 mathops.h --- a/mathops.h Tue Jun 22 19:29:03 2010 +0000 +++ b/mathops.h Tue Jun 22 20:57:00 2010 +0000 @@ -148,9 +148,9 @@ #ifndef PACK4x8 # if HAVE_BIGENDIAN -# define PACK4x8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) +# define PACK4UINT8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) # else -# define PACK4x8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +# define PACK4UINT8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) # endif #endif