From a22a455899dda1ad0b16435a3136b18ab696bb47 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 9 Sep 2016 16:39:34 -0700 Subject: [PATCH] cosmetics,vp8: join some lines, fix table format Change-Id: Idcf3b68f0e59bd74c9d332bbd4a7c1484ddb691a --- vp8/common/entropymode.c | 16 ++++------------ vp8/common/onyxc_int.h | 4 +--- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c index 8d2080e..239492a 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 defb5cb..6d3de4f 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]); -- 2.7.4