[FFmpeg-cvslog] r23721 - in trunk/libavcodec: h264pred.c mathops.h

[rbultje]

Author: rbultje
Date: Tue Jun 22 22:57:00 2010
New Revision: 23721

Log:
Rename PACK4x8() to PACK4UINT8().

Modified:
   trunk/libavcodec/h264pred.c
   trunk/libavcodec/mathops.h

Modified: trunk/libavcodec/h264pred.c
==============================================================================
--- trunk/libavcodec/h264pred.c	Tue Jun 22 21:29:03 2010	(r23720)
+++ trunk/libavcodec/h264pred.c	Tue Jun 22 22:57:00 2010	(r23721)
@@ -109,7 +109,7 @@ static void pred4x4_vertical_vp8_c(uint8
     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);

Modified: trunk/libavcodec/mathops.h
==============================================================================
--- trunk/libavcodec/mathops.h	Tue Jun 22 21:29:03 2010	(r23720)
+++ trunk/libavcodec/mathops.h	Tue Jun 22 22:57:00 2010	(r23721)
@@ -148,9 +148,9 @@ if ((y) < (x)) {\
 
 #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