| Index: content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.cc b/content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| index f667b188e3a7294bca5fa6b69af3a4a943fdfaf9..98f4e48db359b1f724c2d163fdeb924bea43ba9f 100644
|
| --- a/content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| +++ b/content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| @@ -9,6 +9,7 @@
|
| #include <sys/eventfd.h>
|
| #include <sys/ioctl.h>
|
| #include <sys/mman.h>
|
| +#include <utility>
|
|
|
| #include "base/callback.h"
|
| #include "base/command_line.h"
|
| @@ -53,7 +54,7 @@ struct V4L2VideoEncodeAccelerator::BitstreamBufferRef {
|
| BitstreamBufferRef(int32_t id,
|
| scoped_ptr<base::SharedMemory> shm,
|
| size_t size)
|
| - : id(id), shm(shm.Pass()), size(size) {}
|
| + : id(id), shm(std::move(shm)), size(size) {}
|
| const int32_t id;
|
| const scoped_ptr<base::SharedMemory> shm;
|
| const size_t size;
|
| @@ -238,7 +239,7 @@ void V4L2VideoEncodeAccelerator::UseOutputBitstreamBuffer(
|
| }
|
|
|
| scoped_ptr<BitstreamBufferRef> buffer_ref(
|
| - new BitstreamBufferRef(buffer.id(), shm.Pass(), buffer.size()));
|
| + new BitstreamBufferRef(buffer.id(), std::move(shm), buffer.size()));
|
| encoder_thread_.message_loop()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&V4L2VideoEncodeAccelerator::UseOutputBitstreamBufferTask,
|
|
|