diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-18 06:04:57 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-18 06:04:57 -0500 |
| commit | 7369c7d7a5eed32963d8af37658286617919f91c (patch) | |
| tree | 5397ce7ee9bca1641118fdc3187bd9e2b24fdc9c /third_party/aom/test/cpu_speed_test.cc | |
| parent | 77887af9c4ad1420bbdb33984af4f74b55ca59db (diff) | |
| download | UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.gz UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.lz UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.xz UXP-7369c7d7a5eed32963d8af37658286617919f91c.zip | |
Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918
Diffstat (limited to 'third_party/aom/test/cpu_speed_test.cc')
| -rw-r--r-- | third_party/aom/test/cpu_speed_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/aom/test/cpu_speed_test.cc b/third_party/aom/test/cpu_speed_test.cc index ad0f2a874..bde00472d 100644 --- a/third_party/aom/test/cpu_speed_test.cc +++ b/third_party/aom/test/cpu_speed_test.cc @@ -21,8 +21,8 @@ namespace { const int kMaxPSNR = 100; class CpuSpeedTest - : public ::libaom_test::EncoderTest, - public ::libaom_test::CodecTestWith2Params<libaom_test::TestMode, int> { + : public ::libaom_test::CodecTestWith2Params<libaom_test::TestMode, int>, + public ::libaom_test::EncoderTest { protected: CpuSpeedTest() : EncoderTest(GET_PARAM(0)), encoding_mode_(GET_PARAM(1)), |