Mercurial > libavcodec.hg

changeset 11923:2013535ff4e5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename PACK4x8() to PACK4UINT8().
author rbultje
date Tue, 22 Jun 2010 20:57:00 +0000
parents 8c657be75c11
children b3b2fd53617b
files h264pred.c mathops.h
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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