libvpx: Pull from upstream

source/libvpx/test/encode_test_driver.h

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #ifndef TEST_ENCODE_TEST_DRIVER_H_
@@ skipping 165 matching lines @@
 //
 // This class is a mixin which provides the main loop common to all
 // encoder tests. It provides hooks which can be overridden by subclasses
 // to implement each test's specific behavior, while centralizing the bulk
 // of the boilerplate. Note that it doesn't inherit the gtest testing
 // classes directly, so that tests can be parameterized differently.
 class EncoderTest {
  protected:
   explicit EncoderTest(const CodecFactory *codec)
       : codec_(codec), abort_(false), init_flags_(0), frame_flags_(0),
-        last_pts_(0) {}
+        last_pts_(0) {
+    // Default to 1 thread.
+    cfg_.g_threads = 1;
+  }
 
   virtual ~EncoderTest() {}
 
   // Initialize the cfg_ member with the default configuration.
   void InitializeConfig();
 
   // Map the TestMode enum to the deadline_ and passes_ variables.
   void SetMode(TestMode mode);
 
   // Set encoder flag.
@@ skipping 59 matching lines @@
   unsigned long        deadline_;
   TwopassStatsStore    stats_;
   unsigned long        init_flags_;
   unsigned long        frame_flags_;
   vpx_codec_pts_t      last_pts_;
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_ENCODE_TEST_DRIVER_H_