Merge changes from topic 'clang-tidy'
authorJames Zern <jzern@google.com>
Mon, 8 Aug 2016 20:12:42 +0000 (20:12 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 8 Aug 2016 20:12:42 +0000 (20:12 +0000)
* changes:
  *_perf_test.cc: correct DoDecode signature
  test: apply clang-tidy google-readability-braces-around-statements

1  2 
test/decode_test_driver.cc
test/encode_test_driver.cc

Simple merge
@@@ -182,10 -188,11 +188,11 @@@ void EncoderTest::RunLoop(VideoSource *
      unsigned long dec_init_flags = 0;  // NOLINT
      // Use fragment decoder if encoder outputs partitions.
      // NOTE: fragment decoder and partition encoder are only supported by VP8.
-     if (init_flags_ & VPX_CODEC_USE_OUTPUT_PARTITION)
+     if (init_flags_ & VPX_CODEC_USE_OUTPUT_PARTITION) {
        dec_init_flags |= VPX_CODEC_USE_INPUT_FRAGMENTS;
+     }
      testing::internal::scoped_ptr<Decoder> decoder(
 -        codec_->CreateDecoder(dec_cfg, dec_init_flags, 0));
 +        codec_->CreateDecoder(dec_cfg, dec_init_flags));
      bool again;
      for (again = true; again; video->Next()) {
        again = (video->img() != NULL);