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/end_to_end_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/end_to_end_test.cc')
| -rw-r--r-- | third_party/aom/test/end_to_end_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/aom/test/end_to_end_test.cc b/third_party/aom/test/end_to_end_test.cc index 0c8cbe274..93bc1625e 100644 --- a/third_party/aom/test/end_to_end_test.cc +++ b/third_party/aom/test/end_to_end_test.cc @@ -86,9 +86,9 @@ int is_extension_y4m(const char *filename) { } class EndToEndTest - : public ::libaom_test::EncoderTest, - public ::libaom_test::CodecTestWith3Params<libaom_test::TestMode, - TestVideoParam, int> { + : public ::libaom_test::CodecTestWith3Params<libaom_test::TestMode, + TestVideoParam, int>, + public ::libaom_test::EncoderTest { protected: EndToEndTest() : EncoderTest(GET_PARAM(0)), test_video_param_(GET_PARAM(2)), @@ -110,7 +110,6 @@ class EndToEndTest cfg_.rc_buf_initial_sz = 500; cfg_.rc_buf_optimal_sz = 600; } - dec_cfg_.threads = 4; } virtual void BeginPassHook(unsigned int) { |