diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:58:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:58:17 +0000 |
| commit | 8efa6801b4ee41ab37d2b65fbd823fba242e1adb (patch) | |
| tree | bbe71d222b2e2c60a307e5f147af6011b0e6b021 /media | |
| parent | f56e69453eced97f31dc23bc72ae883f9e260eee (diff) | |
| download | chromium_src-8efa6801b4ee41ab37d2b65fbd823fba242e1adb.zip chromium_src-8efa6801b4ee41ab37d2b65fbd823fba242e1adb.tar.gz chromium_src-8efa6801b4ee41ab37d2b65fbd823fba242e1adb.tar.bz2 | |
Revert everything related to the relanding.
Review URL: http://codereview.chromium.org/2982009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52367 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, 0 insertions, 5 deletions
diff --git a/media/base/filters.h b/media/base/filters.h index 8879233..80a3bd2 100644 --- a/media/base/filters.h +++ b/media/base/filters.h @@ -31,7 +31,6 @@ #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 92bec7a..327b64d 100644 --- a/media/base/pipeline_impl.h +++ b/media/base/pipeline_impl.h @@ -13,7 +13,6 @@ #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 df407b5..1cacdd1 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -5,7 +5,6 @@ #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 c2f0f6b..3bf65e4 100644 --- a/media/filters/ffmpeg_glue_unittest.cc +++ b/media/filters/ffmpeg_glue_unittest.cc @@ -2,7 +2,6 @@ // 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 c00dc52..a0bb0f4 100644 --- a/media/filters/video_renderer_base.h +++ b/media/filters/video_renderer_base.h @@ -19,7 +19,6 @@ #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" |