Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decoder_stream.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 4bf80a2f0ee8057c84539a35e4ef52bf74cd28fa..f942ea445ccf8d5237ed8a6b18869316914df8f1 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -5,6 +5,7 @@
#include "media/filters/ffmpeg_demuxer.h"
#include <algorithm>
+#include <utility>
#include "base/base64.h"
#include "base/bind.h"
@@ -221,7 +222,7 @@ scoped_ptr<FFmpegDemuxerStream> FFmpegDemuxerStream::Create(
}
return make_scoped_ptr(new FFmpegDemuxerStream(
- demuxer, stream, audio_config.Pass(), video_config.Pass()));
+ demuxer, stream, std::move(audio_config), std::move(video_config)));
}
//
@@ -415,7 +416,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
}
if (decrypt_config)
- buffer->set_decrypt_config(decrypt_config.Pass());
+ buffer->set_decrypt_config(std::move(decrypt_config));
}
if (packet->duration >= 0) {
@@ -1438,7 +1439,7 @@ void FFmpegDemuxer::OnReadFrameDone(ScopedAVPacket packet, int result) {
}
FFmpegDemuxerStream* demuxer_stream = streams_[packet->stream_index];
- demuxer_stream->EnqueuePacket(packet.Pass());
+ demuxer_stream->EnqueuePacket(std::move(packet));
}
// Keep reading until we've reached capacity.
« no previous file with comments | « media/filters/decoder_stream.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698