summaryrefslogtreecommitdiff
path: root/libavcodec/vp9dsp.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2014-12-15 22:12:50 -0500
committerMichael Niedermayer <michaelni@gmx.at>2014-12-19 14:07:18 +0100
commitb6e1711223a4f25f2981417a4b773a65dd0423c1 (patch)
tree54df6a39519bc1f648bd053e4254ef65f7389d79 /libavcodec/vp9dsp.c
parente67496fe9db3a25ac1bc08bd77eca95b79d25cac (diff)
vp9/x86: invert hu_ipred left array ordering.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp9dsp.c')
-rw-r--r--libavcodec/vp9dsp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vp9dsp.c b/libavcodec/vp9dsp.c
index 6356adde32..4d4518748a 100644
--- a/libavcodec/vp9dsp.c
+++ b/libavcodec/vp9dsp.c
@@ -786,7 +786,7 @@ def_vert_left(32)
static void hor_up_4x4_c(uint8_t *dst, ptrdiff_t stride,
const uint8_t *left, const uint8_t *top)
{
- int l0 = left[3], l1 = left[2], l2 = left[1], l3 = left[0];
+ int l0 = left[0], l1 = left[1], l2 = left[2], l3 = left[3];
DST(0,0) = (l0 + l1 + 1) >> 1;
DST(1,0) = (l0 + l1 * 2 + l2 + 2) >> 2;
@@ -805,17 +805,17 @@ static void hor_up_##size##x##size##_c(uint8_t *dst, ptrdiff_t stride, \
uint8_t v[size*2 - 2]; \
\
for (i = 0; i < size - 2; i++) { \
- v[i*2 ] = (left[size - i - 1] + left[size - i - 2] + 1) >> 1; \
- v[i*2 + 1] = (left[size - i - 1] + left[size - i - 2] * 2 + left[size - i - 3] + 2) >> 2; \
+ v[i*2 ] = (left[i] + left[i + 1] + 1) >> 1; \
+ v[i*2 + 1] = (left[i] + left[i + 1] * 2 + left[i + 2] + 2) >> 2; \
} \
- v[size*2 - 4] = (left[1] + left[0] + 1) >> 1; \
- v[size*2 - 3] = (left[1] + left[0] * 3 + 2) >> 2; \
+ v[size*2 - 4] = (left[size - 2] + left[size - 1] + 1) >> 1; \
+ v[size*2 - 3] = (left[size - 2] + left[size - 1] * 3 + 2) >> 2; \
\
for (j = 0; j < size / 2; j++) \
memcpy(dst + j*stride, v + j*2, size); \
for (j = size / 2; j < size; j++) { \
memcpy(dst + j*stride, v + j*2, size*2 - 2 - j*2); \
- memset(dst + j*stride + size*2 - 2 - j*2, left[0], \
+ memset(dst + j*stride + size*2 - 2 - j*2, left[size - 1], \
2 + j*2 - size); \
} \
}