commit b0ef6ff3151f021194b9537677892f168a7a7da9
author Johann <johannkoenig@google.com> Thu Feb 08 14:32:21 2018 -0800
committer Johann <johannkoenig@google.com> Sat Feb 10 08:46:36 2018 -0800
tree 21cbdc8057925fbc8423b65ec169a689ffecdf69
parent e8c11385b8da4857b6f18251a38f2dbb9c240fa6

av1/encoder: apply clang-format v5.0.0

Change-Id: If88516ac3dcd72b528f4f7e27aab181a5137b285

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index b92d197..4feaca1 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -285,7 +285,7 @@
 #if CONFIG_SEGMENT_GLOBALMV
         || segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)
 #endif
-            )
+    )
       if (!av1_is_valid_scale(&cm->frame_refs[0].sf))
         return;  // LAST_FRAME not valid for reference
 
@@ -440,10 +440,9 @@
       const int is_cat6 = (extra_bits->base_val == CAT6_MIN_VAL);
       // be written excluding
       // the sign bit.
-      int skip_bits =
-          is_cat6
-              ? CAT6_BIT_SIZE - av1_get_cat6_extrabits_size(tx_size, bit_depth)
-              : 0;
+      int skip_bits = is_cat6 ? CAT6_BIT_SIZE - av1_get_cat6_extrabits_size(
+                                                    tx_size, bit_depth)
+                              : 0;
 
       assert(!(bit_string >> (bit_string_length - skip_bits + 1)));
       if (bit_string_length > 0)
@@ -2254,9 +2253,8 @@
   if (num_planes > 1) {
     int s = AOMMIN(cm->subsampling_x, cm->subsampling_y);
     if (s && !chroma_none) {
-      aom_wb_write_bit(wb,
-                       cm->rst_info[1].restoration_unit_size !=
-                           cm->rst_info[0].restoration_unit_size);
+      aom_wb_write_bit(wb, cm->rst_info[1].restoration_unit_size !=
+                               cm->rst_info[0].restoration_unit_size);
       assert(cm->rst_info[1].restoration_unit_size ==
                  cm->rst_info[0].restoration_unit_size ||
              cm->rst_info[1].restoration_unit_size ==
@@ -4526,7 +4524,7 @@
                                           ,
                                           uint8_t enhancement_layers_cnt) {
 #else
-                                          ) {
+) {
 #endif
   AV1_COMMON *const cm = &cpi->common;
   struct aom_write_bit_buffer wb = { dst, 0 };