ref: 5f80d2ad331de99ebfe1095d4a4fefb6f30fbfbb
parent: 38f6a3cdc77d3c0899edd1d281297481758df4d2
parent: 424c74e736997011cbee5371ba2928870c95b5b5
author: Jim Bankoski <jimbankoski@google.com>
date: Fri Oct 4 12:41:46 EDT 2013
Merge "cpplint vp9_dct.c issues resolved"
--- a/vp9/encoder/vp9_dct.c
+++ b/vp9/encoder/vp9_dct.c
@@ -593,11 +593,11 @@
/* 4-point reversible, orthonormal Walsh-Hadamard in 3.5 adds, 0.5 shifts per
pixel. */
-void vp9_short_walsh4x4_c(short *input, short *output, int pitch) {
+void vp9_short_walsh4x4_c(int16_t *input, int16_t *output, int pitch) {
int i;
int a1, b1, c1, d1, e1;
- short *ip = input;
- short *op = output;
+ int16_t *ip = input;
+ int16_t *op = output;
int pitch_short = pitch >> 1;
for (i = 0; i < 4; i++) {
@@ -647,7 +647,7 @@
}
}
-void vp9_short_walsh8x4_c(short *input, short *output, int pitch) {
+void vp9_short_walsh8x4_c(int16_t *input, int16_t *output, int pitch) {
vp9_short_walsh4x4_c(input, output, pitch);
vp9_short_walsh4x4_c(input + 4, output + 16, pitch);
}
--
⑨