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

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

Issue 1874413003: Convert media/formats to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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
Index: media/formats/mp4/box_definitions.cc
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
index b7f181534c91d275b731a823f2f1d11ddbdbea1d..1b9a8338cf41cfd9dd5d8f676fb3fe6422db5472 100644
--- a/media/formats/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -4,6 +4,7 @@
#include "media/formats/mp4/box_definitions.h"
+#include <memory>
#include <utility>
#include "base/logging.h"
@@ -637,7 +638,7 @@ bool VideoSampleEntry::Parse(BoxReader* reader) {
if (IsFormatValidH264(format, sinf)) {
DVLOG(2) << __FUNCTION__
<< " reading AVCDecoderConfigurationRecord (avcC)";
- scoped_ptr<AVCDecoderConfigurationRecord> avcConfig(
+ std::unique_ptr<AVCDecoderConfigurationRecord> avcConfig(
new AVCDecoderConfigurationRecord());
RCHECK(reader->ReadChild(avcConfig.get()));
frame_bitstream_converter =
@@ -648,7 +649,7 @@ bool VideoSampleEntry::Parse(BoxReader* reader) {
} else if (IsFormatValidHEVC(format, sinf)) {
DVLOG(2) << __FUNCTION__
<< " parsing HEVCDecoderConfigurationRecord (hvcC)";
- scoped_ptr<HEVCDecoderConfigurationRecord> hevcConfig(
+ std::unique_ptr<HEVCDecoderConfigurationRecord> hevcConfig(
new HEVCDecoderConfigurationRecord());
RCHECK(reader->ReadChild(hevcConfig.get()));
frame_bitstream_converter =

Powered by Google App Engine
This is Rietveld 408576698