diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
| commit | 5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b (patch) | |
| tree | 4df72d2d3125b017df6fd3286d331a5fcd8498a4 /media | |
| parent | 7f041050fd817116b78aa09227f511cc6505d7f3 (diff) | |
| download | chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.zip chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.gz chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.bz2 | |
Attempt four at landing the "histogram.h removed from message_loop.h" patch.
Previously committed as r52349 and r52336. Related commits: r52367, r52364
and r52343.
Rerunning trybots due to previous trybot breakage.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2965015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/filters.h | 1 | ||||
| -rw-r--r-- | media/base/pipeline_impl.h | 1 | ||||
| -rw-r--r-- | media/base/video_frame_unittest.cc | 1 | ||||
| -rw-r--r-- | media/filters/ffmpeg_glue_unittest.cc | 1 | ||||
| -rw-r--r-- | media/filters/video_renderer_base.h | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/media/base/filters.h b/media/base/filters.h index 80a3bd2..8879233 100644 --- a/media/base/filters.h +++ b/media/base/filters.h @@ -31,6 +31,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/time.h" +#include "base/scoped_ptr.h" #include "media/base/media_format.h" namespace media { diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h index 327b64d..92bec7a 100644 --- a/media/base/pipeline_impl.h +++ b/media/base/pipeline_impl.h @@ -13,6 +13,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" +#include "base/scoped_ptr.h" #include "base/thread.h" #include "base/time.h" #include "media/base/clock_impl.h" diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index 1cacdd1..df407b5 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -5,6 +5,7 @@ #include "media/base/video_frame.h" #include "base/format_macros.h" +#include "base/scoped_ptr.h" #include "base/string_util.h" #include "media/base/buffers.h" #include "media/base/mock_filters.h" diff --git a/media/filters/ffmpeg_glue_unittest.cc b/media/filters/ffmpeg_glue_unittest.cc index 3bf65e4..c2f0f6b 100644 --- a/media/filters/ffmpeg_glue_unittest.cc +++ b/media/filters/ffmpeg_glue_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/scoped_ptr.h" #include "media/base/mock_ffmpeg.h" #include "media/base/mock_filters.h" #include "media/ffmpeg/ffmpeg_common.h" diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h index af4f51c..ff5c232 100644 --- a/media/filters/video_renderer_base.h +++ b/media/filters/video_renderer_base.h @@ -19,6 +19,7 @@ #include "base/condition_variable.h" #include "base/lock.h" +#include "base/scoped_ptr.h" #include "media/base/filters.h" #include "media/base/video_frame.h" |