commit bda8d61ed19d4a9d328ef8d0b28a9829326888b0
author clang-format <noreply@google.com> Mon Sep 19 15:55:46 2016 -0700
committer James Zern <jzern@google.com> Mon Sep 19 15:56:08 2016 -0700
tree d5ea0aace9a3a9d0251344a9ee75987abbf126c5
parent 674e9a7ca6dc9bedb8dcc9152289314069e0ce1f

apply clang-format after 5cd2ab9

Change-Id: I186e90d99cd54e66d38159b7cb55a881226b1568

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index b4c3525..9efe016 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1914,8 +1914,8 @@
 static void decode_restoration(AV1_COMMON *cm, aom_reader *rb) {
   int i;
   RestorationInfo *rsi = &cm->rst_info;
-  const int ntiles = av1_get_rest_ntiles(cm->width, cm->height,
-                                         NULL, NULL, NULL, NULL);
+  const int ntiles =
+      av1_get_rest_ntiles(cm->width, cm->height, NULL, NULL, NULL, NULL);
   if (rsi->frame_restoration_type != RESTORE_NONE) {
     rsi->restoration_type = (RestorationType *)aom_realloc(
         rsi->restoration_type, sizeof(*rsi->restoration_type) * ntiles);
@@ -1938,24 +1938,18 @@
             rb, av1_switchable_restore_tree, cm->fc->switchable_restore_prob);
         if (rsi->restoration_type[i] == RESTORE_WIENER) {
           rsi->wiener_level[i] = 1;
-          rsi->vfilter[i][0] =
-              aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
-              WIENER_FILT_TAP0_MINV;
-          rsi->vfilter[i][1] =
-              aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
-              WIENER_FILT_TAP1_MINV;
-          rsi->vfilter[i][2] =
-              aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
-              WIENER_FILT_TAP2_MINV;
-          rsi->hfilter[i][0] =
-              aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
-              WIENER_FILT_TAP0_MINV;
-          rsi->hfilter[i][1] =
-              aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
-              WIENER_FILT_TAP1_MINV;
-          rsi->hfilter[i][2] =
-              aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
-              WIENER_FILT_TAP2_MINV;
+          rsi->vfilter[i][0] = aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
+                               WIENER_FILT_TAP0_MINV;
+          rsi->vfilter[i][1] = aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
+                               WIENER_FILT_TAP1_MINV;
+          rsi->vfilter[i][2] = aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
+                               WIENER_FILT_TAP2_MINV;
+          rsi->hfilter[i][0] = aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
+                               WIENER_FILT_TAP0_MINV;
+          rsi->hfilter[i][1] = aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
+                               WIENER_FILT_TAP1_MINV;
+          rsi->hfilter[i][2] = aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
+                               WIENER_FILT_TAP2_MINV;
         } else if (rsi->restoration_type[i] == RESTORE_BILATERAL) {
           int s;
           for (s = 0; s < BILATERAL_SUBTILES; ++s) {