Originally committed as revision 23721 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -109,7 +109,7 @@ static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, int st |
| 109 | 109 |
const int lt= src[-1-1*stride]; |
| 110 | 110 |
LOAD_TOP_EDGE |
| 111 | 111 |
LOAD_TOP_RIGHT_EDGE |
| 112 |
- uint32_t v = PACK4x8((lt + 2*t0 + t1 + 2) >> 2, |
|
| 112 |
+ uint32_t v = PACK4UINT8((lt + 2*t0 + t1 + 2) >> 2, |
|
| 113 | 113 |
(t0 + 2*t1 + t2 + 2) >> 2, |
| 114 | 114 |
(t1 + 2*t2 + t3 + 2) >> 2, |
| 115 | 115 |
(t2 + 2*t3 + t4 + 2) >> 2); |
| ... | ... |
@@ -148,9 +148,9 @@ if ((y) < (x)) {\
|
| 148 | 148 |
|
| 149 | 149 |
#ifndef PACK4x8 |
| 150 | 150 |
# if HAVE_BIGENDIAN |
| 151 |
-# define PACK4x8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) |
|
| 151 |
+# define PACK4UINT8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) |
|
| 152 | 152 |
# else |
| 153 |
-# define PACK4x8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) |
|
| 153 |
+# define PACK4UINT8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) |
|
| 154 | 154 |
# endif |
| 155 | 155 |
#endif |
| 156 | 156 |
|