shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix a few indent format issues in buffer defs"

--- a/vp9/common/mips/dspr2/vp9_convolve8_avg_dspr2.c

+++ b/vp9/common/mips/dspr2/vp9_convolve8_avg_dspr2.c

@@ -435,7 +435,7 @@

                       filter_y, y_step_q4,

                       w, intermediate_height);

-  vp9_convolve8_avg_vert(temp + (64*3), 64,

+  vp9_convolve8_avg_vert(temp + 64 * 3, 64,

                          dst, dst_stride,

                          filter_x, x_step_q4,

                          filter_y, y_step_q4,

--- a/vp9/common/x86/vp9_asm_stubs.c

+++ b/vp9/common/x86/vp9_asm_stubs.c

@@ -217,7 +217,7 @@

                          const int16_t *filter_x, int x_step_q4,

                          const int16_t *filter_y, int y_step_q4,

                          int w, int h) {

-  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64*71);

+  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64 * 71);

   assert(w <= 64);

   assert(h <= 64);

@@ -238,7 +238,7 @@

                          const int16_t *filter_x, int x_step_q4,

                          const int16_t *filter_y, int y_step_q4,

                          int w, int h) {

-  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64*71);

+  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64 * 71);

   assert(w <= 64);

   assert(h <= 64);

@@ -428,7 +428,7 @@

                          const int16_t *filter_x, int x_step_q4,

                          const int16_t *filter_y, int y_step_q4,

                          int w, int h) {

-  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64*71);

+  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64 * 71);

   assert(w <= 64);

   assert(h <= 64);

@@ -449,7 +449,7 @@

                          const int16_t *filter_x, int x_step_q4,

                          const int16_t *filter_y, int y_step_q4,

                          int w, int h) {

-  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64*71);

+  DECLARE_ALIGNED_ARRAY(16, unsigned char, fdata2, 64 * 71);

   assert(w <= 64);

   assert(h <= 64);

--- a/vp9/encoder/vp9_block.h

+++ b/vp9/encoder/vp9_block.h

@@ -55,8 +55,8 @@

 } PICK_MODE_CONTEXT;

 struct macroblock_plane {

-  DECLARE_ALIGNED(16, int16_t, src_diff[64*64]);

-  DECLARE_ALIGNED(16, int16_t, coeff[64*64]);

+  DECLARE_ALIGNED(16, int16_t, src_diff[64 * 64]);

+  DECLARE_ALIGNED(16, int16_t, coeff[64 * 64]);

   struct buf_2d src;

   // Quantizer setings