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

Unified Diff: media/formats/mp4/box_definitions.cc

Issue 1553493002: Global conversion of Pass()→std::move() on OS=linux chromecast=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix fragile include order 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/formats/mp4/avc.cc ('k') | media/formats/mp4/hevc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/box_definitions.cc
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
index 95e0b2f0d811a94cabe5c9ea4d747822a5c5afb2..e448b1a1e904403b09b2ca5a6559a01dfe80e667 100644
--- a/media/formats/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -4,6 +4,8 @@
#include "media/formats/mp4/box_definitions.h"
+#include <utility>
+
#include "base/logging.h"
#include "media/base/video_types.h"
#include "media/base/video_util.h"
@@ -520,8 +522,8 @@ bool VideoSampleEntry::Parse(BoxReader* reader) {
scoped_ptr<AVCDecoderConfigurationRecord> avcConfig(
new AVCDecoderConfigurationRecord());
RCHECK(reader->ReadChild(avcConfig.get()));
- frame_bitstream_converter = make_scoped_refptr(
- new AVCBitstreamConverter(avcConfig.Pass()));
+ frame_bitstream_converter =
+ make_scoped_refptr(new AVCBitstreamConverter(std::move(avcConfig)));
video_codec = kCodecH264;
video_codec_profile = H264PROFILE_MAIN;
#if defined(ENABLE_HEVC_DEMUXING)
@@ -531,8 +533,8 @@ bool VideoSampleEntry::Parse(BoxReader* reader) {
scoped_ptr<HEVCDecoderConfigurationRecord> hevcConfig(
new HEVCDecoderConfigurationRecord());
RCHECK(reader->ReadChild(hevcConfig.get()));
- frame_bitstream_converter = make_scoped_refptr(
- new HEVCBitstreamConverter(hevcConfig.Pass()));
+ frame_bitstream_converter =
+ make_scoped_refptr(new HEVCBitstreamConverter(std::move(hevcConfig)));
video_codec = kCodecHEVC;
#endif
} else {
« no previous file with comments | « media/formats/mp4/avc.cc ('k') | media/formats/mp4/hevc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698