summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2016-09-09 16:39:34 -0700
committerJames Zern <jzern@google.com>2016-09-09 16:39:34 -0700
commita22a455899dda1ad0b16435a3136b18ab696bb47 (patch)
treeea3d7a69119d463c84aa632cefe6bfd3aa80db80
parent421f376568b2b07a43a93fb055f7e2c48d111a0a (diff)
downloadlibvpx-a22a455899dda1ad0b16435a3136b18ab696bb47.tar
libvpx-a22a455899dda1ad0b16435a3136b18ab696bb47.tar.gz
libvpx-a22a455899dda1ad0b16435a3136b18ab696bb47.tar.bz2
libvpx-a22a455899dda1ad0b16435a3136b18ab696bb47.zip
cosmetics,vp8: join some lines, fix table format
Change-Id: Idcf3b68f0e59bd74c9d332bbd4a7c1484ddb691a
-rw-r--r--vp8/common/entropymode.c16
-rw-r--r--vp8/common/onyxc_int.h4
2 files changed, 5 insertions, 15 deletions
diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c
index 8d2080eeb..239492a8c 100644
--- a/vp8/common/entropymode.c
+++ b/vp8/common/entropymode.c
@@ -43,18 +43,10 @@ const vp8_prob vp8_sub_mv_ref_prob2[SUBMVREF_COUNT][VP8_SUBMVREFS - 1] = {
};
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 };
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index defb5cb83..6d3de4f1a 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -59,9 +59,7 @@ typedef enum {
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]);