shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "cosmetics,vp8: join some lines, fix table format"

--- a/vp8/common/entropymode.c

+++ b/vp8/common/entropymode.c

@@ -43,18 +43,10 @@

 };

 const vp8_mbsplit vp8_mbsplits[VP8_NUMMBSPLITS] = {

-  {

-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,

-  },

-  {

-      0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1,

-  },

-  {

-      0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3,

-  },

-  {

-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,

-  }

+  { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 },

+  { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1 },

+  { 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 },

+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }

 };

 const int vp8_mbsplit_count[VP8_NUMMBSPLITS] = { 2, 2, 4, 16 };

--- a/vp8/common/onyxc_int.h

+++ b/vp8/common/onyxc_int.h

@@ -59,9 +59,7 @@

   RECON_CLAMP_NOTREQUIRED = 1

 } CLAMP_TYPE;

-typedef struct VP8Common

-

-    {

+typedef struct VP8Common {

   struct vpx_internal_error_info error;

   DECLARE_ALIGNED(16, short, Y1dequant[QINDEX_RANGE][2]);