From 7c61aa15ed3a69c41dfa4b311e6a8444fe241720 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Thu, 7 Jan 2016 10:33:08 -0800 Subject: [PATCH] Remove webm_tools which is not needed - Another minor change in segmenter_test_base: scoped_refptr can be passed by value, remove ".Pass". Change-Id: I31f0cf74c5ad0aba8890d3b1845155d63d7326a0 --- .gitignore | 1 - DEPS | 3 --- packager/media/formats/webm/segmenter_test_base.cc | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 45748e9622..8eb4781ea1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ /packager/third_party/llvm-build/ /packager/third_party/modp_b64/ /packager/third_party/tcmalloc/ -/packager/third_party/webm-tools/src/ /packager/third_party/yasm/source/patched-yasm/ /packager/third_party/zlib/ /packager/tools/clang/ diff --git a/DEPS b/DEPS index 79e6befee2..1169781945 100644 --- a/DEPS +++ b/DEPS @@ -57,9 +57,6 @@ deps = { "src/packager/third_party/tcmalloc/chromium": Var("chromium_git") + "/chromium/src/third_party/tcmalloc/chromium@fa1492f75861094061043a17c0f779c3d35780bf", - "src/packager/third_party/webm-tools/src": - Var("chromium_git") + "/webm/webm-tools@702ff3e4bb462b24464a202f8fcf9f65cc44b6e5", - "src/packager/tools/clang": Var("chromium_git") + "/chromium/src/tools/clang@0de8f3bb6af64e13876273c601704795d5e00faf", diff --git a/packager/media/formats/webm/segmenter_test_base.cc b/packager/media/formats/webm/segmenter_test_base.cc index 56d6daa4fc..e1b0d86019 100644 --- a/packager/media/formats/webm/segmenter_test_base.cc +++ b/packager/media/formats/webm/segmenter_test_base.cc @@ -55,7 +55,7 @@ scoped_refptr SegmentTestBase::CreateSample(bool is_key_frame, sample->set_duration(duration); cur_time_timescale_ += duration; - return sample.Pass(); + return sample; } MuxerOptions SegmentTestBase::CreateMuxerOptions() const {