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

Unified Diff: media/formats/mp4/mp4_stream_parser.h

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/mp4_stream_parser.h
diff --git a/media/formats/mp4/mp4_stream_parser.h b/media/formats/mp4/mp4_stream_parser.h
index 9a4c7f03b7049e8b2a7325268f58d9e3ba04a1e5..bf3c688d604d0df7266562d3fe7786c53c3feb30 100644
--- a/media/formats/mp4/mp4_stream_parser.h
+++ b/media/formats/mp4/mp4_stream_parser.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <set>
#include <vector>
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/base/media_export.h"
#include "media/base/stream_parser.h"
#include "media/formats/common/offset_byte_queue.h"
@@ -116,8 +116,8 @@ class MEDIA_EXPORT MP4StreamParser : public StreamParser {
// enough bytes to parse all samples and aux_info in the current moof.
int64_t highest_end_offset_;
- scoped_ptr<mp4::Movie> moov_;
- scoped_ptr<mp4::TrackRunIterator> runs_;
+ std::unique_ptr<mp4::Movie> moov_;
+ std::unique_ptr<mp4::TrackRunIterator> runs_;
bool has_audio_;
bool has_video_;

Powered by Google App Engine
This is Rietveld 408576698