| Index: content/common/gpu/media/v4l2_image_processor.h
|
| diff --git a/content/common/gpu/media/v4l2_image_processor.h b/content/common/gpu/media/v4l2_image_processor.h
|
| index 6d81893fc43ef6c57e7353c1f116ededbd2987e4..04d29bc010f95432bd7ff7feba1f932eb48dfe7c 100644
|
| --- a/content/common/gpu/media/v4l2_image_processor.h
|
| +++ b/content/common/gpu/media/v4l2_image_processor.h
|
| @@ -9,7 +9,6 @@
|
| #include <vector>
|
|
|
| #include "base/memory/linked_ptr.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread.h"
|
| #include "content/common/content_export.h"
|
| @@ -23,7 +22,7 @@
|
| // hardware accelerators (see V4L2VideoDecodeAccelerator) for more details.
|
| class CONTENT_EXPORT V4L2ImageProcessor {
|
| public:
|
| - explicit V4L2ImageProcessor(const scoped_refptr<V4L2Device>& device);
|
| + explicit V4L2ImageProcessor(scoped_ptr<V4L2Device> device);
|
| virtual ~V4L2ImageProcessor();
|
|
|
| // Initializes the processor to convert from |input_format| to |output_format|
|
| @@ -137,7 +136,7 @@
|
| const scoped_refptr<base::MessageLoopProxy> child_message_loop_proxy_;
|
|
|
| // V4L2 device in use.
|
| - scoped_refptr<V4L2Device> device_;
|
| + scoped_ptr<V4L2Device> device_;
|
|
|
| // Thread to communicate with the device on.
|
| base::Thread device_thread_;
|
|
|