From: James Zern Date: Mon, 8 Aug 2016 20:12:42 +0000 (+0000) Subject: Merge changes from topic 'clang-tidy' X-Git-Tag: v1.6.1~335 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfd92dab18639c7f1198393ce04613e6d2b126eb;p=platform%2Fupstream%2Flibvpx.git Merge changes from topic 'clang-tidy' * changes: *_perf_test.cc: correct DoDecode signature test: apply clang-tidy google-readability-braces-around-statements --- cfd92dab18639c7f1198393ce04613e6d2b126eb diff --cc test/encode_test_driver.cc index 32269af,7822361..632c98f --- a/test/encode_test_driver.cc +++ b/test/encode_test_driver.cc @@@ -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( - 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);