summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/base/callback.h2
-rw-r--r--media/base/filter_factories.h2
-rw-r--r--media/base/filters.h1
-rw-r--r--media/base/pipeline_status.h2
-rw-r--r--media/filters/audio_renderer_algorithm_base.h2
-rw-r--r--media/video/omx_video_decode_engine.h2
-rw-r--r--media/video/video_decode_accelerator.h2
7 files changed, 7 insertions, 6 deletions
diff --git a/media/base/callback.h b/media/base/callback.h
index 8b819bc..460af24 100644
--- a/media/base/callback.h
+++ b/media/base/callback.h
@@ -21,7 +21,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/scoped_ptr.h"
#include "base/task.h"
diff --git a/media/base/filter_factories.h b/media/base/filter_factories.h
index b716041..5286b3f 100644
--- a/media/base/filter_factories.h
+++ b/media/base/filter_factories.h
@@ -7,7 +7,7 @@
#include<string>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "media/base/pipeline_status.h"
namespace media {
diff --git a/media/base/filters.h b/media/base/filters.h
index 7c13bea..f569e73 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -27,6 +27,7 @@
#include <string>
#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h
index 84c8d4f..3fc222d 100644
--- a/media/base/pipeline_status.h
+++ b/media/base/pipeline_status.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_PIPELINE_STATUS_H_
#define MEDIA_BASE_PIPELINE_STATUS_H_
-#include "base/callback.h"
+#include "base/callback_old.h"
namespace media {
diff --git a/media/filters/audio_renderer_algorithm_base.h b/media/filters/audio_renderer_algorithm_base.h
index ae7fdab..f6ead0d 100644
--- a/media/filters/audio_renderer_algorithm_base.h
+++ b/media/filters/audio_renderer_algorithm_base.h
@@ -25,7 +25,7 @@
#include <deque>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "media/base/seekable_buffer.h"
diff --git a/media/video/omx_video_decode_engine.h b/media/video/omx_video_decode_engine.h
index 26b6bcf..e9cc756 100644
--- a/media/video/omx_video_decode_engine.h
+++ b/media/video/omx_video_decode_engine.h
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "base/memory/scoped_ptr.h"
#include "media/omx/omx_configurator.h"
#include "media/video/video_decode_engine.h"
diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h
index be799c11..cece4d8 100644
--- a/media/video/video_decode_accelerator.h
+++ b/media/video/video_decode_accelerator.h
@@ -8,7 +8,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/callback_old.h"
#include "media/base/bitstream_buffer.h"
#include "ui/gfx/size.h"