| Index: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| diff --git a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| index 85f94f0348fabe6dc77f1b223c9e9dfead2f45a3..17ad900b9f96a4f535a1146c11f3212234893133 100644
|
| --- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| +++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| @@ -18,7 +18,7 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/thread.h"
|
| #include "content/common/content_export.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
| #include "media/video/jpeg_decode_accelerator.h"
|
|
|
| namespace gpu {
|
| @@ -53,7 +53,7 @@ class CONTENT_EXPORT VideoCaptureGpuJpegDecoder
|
| };
|
|
|
| typedef base::Callback<void(
|
| - std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>,
|
| + std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>,
|
| const scoped_refptr<media::VideoFrame>&)>
|
| DecodeDoneCB;
|
|
|
| @@ -76,7 +76,7 @@ class CONTENT_EXPORT VideoCaptureGpuJpegDecoder
|
| const media::VideoCaptureFormat& frame_format,
|
| base::TimeTicks reference_time,
|
| base::TimeDelta timestamp,
|
| - std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> out_buffer);
|
| + std::unique_ptr<device::VideoCaptureDevice::Client::Buffer> out_buffer);
|
|
|
| // JpegDecodeAccelerator::Client implementation.
|
| // These will be called on IO thread.
|
|
|