Index: media/gpu/v4l2_video_decode_accelerator.cc |
diff --git a/media/gpu/v4l2_video_decode_accelerator.cc b/media/gpu/v4l2_video_decode_accelerator.cc |
index 41aacbff4a67e203e8124f8dda51394920f98b40..c8154d9ea2f4ae64d6314a8242315d460ebb0b04 100644 |
--- a/media/gpu/v4l2_video_decode_accelerator.cc |
+++ b/media/gpu/v4l2_video_decode_accelerator.cc |
@@ -648,14 +648,15 @@ void V4L2VideoDecodeAccelerator::DecodeBufferTask() { |
// We're waiting for a new buffer -- exit without scheduling a new task. |
return; |
} |
- linked_ptr<BitstreamBufferRef>& buffer_ref = decoder_input_queue_.front(); |
+ std::unique_ptr<BitstreamBufferRef>& buffer_ref = |
sandersd (OOO until July 31)
2016/09/13 18:30:59
This change does not make sense to me, since the q
|
+ decoder_input_queue_.front(); |
if (decoder_delay_bitstream_buffer_id_ == buffer_ref->input_id) { |
// We're asked to delay decoding on this and subsequent buffers. |
return; |
} |
// Setup to use the next buffer. |
- decoder_current_bitstream_buffer_.reset(buffer_ref.release()); |
+ decoder_current_bitstream_buffer_ = std::move(buffer_ref); |
decoder_input_queue_.pop(); |
const auto& shm = decoder_current_bitstream_buffer_->shm; |
if (shm) { |