| Index: content/common/gpu/media/v4l2_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/v4l2_video_decode_accelerator.h b/content/common/gpu/media/v4l2_video_decode_accelerator.h
|
| index 43ab8f1b260ee8a1ea8802e594df36bb48f2613d..b7841f5634467c364ff9ff299fa97bf156de32c8 100644
|
| --- a/content/common/gpu/media/v4l2_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/v4l2_video_decode_accelerator.h
|
| @@ -14,7 +14,6 @@
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/memory/linked_ptr.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/thread.h"
|
| @@ -81,7 +80,7 @@
|
| EGLContext egl_context,
|
| const base::WeakPtr<Client>& io_client_,
|
| const base::Callback<bool(void)>& make_context_current,
|
| - const scoped_refptr<V4L2Device>& device,
|
| + scoped_ptr<V4L2Device> device,
|
| const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy);
|
| virtual ~V4L2VideoDecodeAccelerator();
|
|
|
| @@ -341,7 +340,7 @@
|
| // BitstreamBuffer we're presently reading.
|
| scoped_ptr<BitstreamBufferRef> decoder_current_bitstream_buffer_;
|
| // The V4L2Device this class is operating upon.
|
| - scoped_refptr<V4L2Device> device_;
|
| + scoped_ptr<V4L2Device> device_;
|
| // FlushTask() and ResetTask() should not affect buffers that have been
|
| // queued afterwards. For flushing or resetting the pipeline then, we will
|
| // delay these buffers until after the flush or reset completes.
|
|
|