summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/h264pred.c2
-rw-r--r--libavcodec/mathops.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index 296e44b474..52cf14c22e 100644
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -109,7 +109,7 @@ static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, int st
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 --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 917112b86e..ebf57f5a4f 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -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