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

Unified Diff: media/formats/mp4/avc.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/avc.h
diff --git a/media/formats/mp4/avc.h b/media/formats/mp4/avc.h
index e1df1dd88594b6eb89f0a6b758521de675e22fdb..b85d56e5b04cd6a025b72a48ceb345a71e462584 100644
--- a/media/formats/mp4/avc.h
+++ b/media/formats/mp4/avc.h
@@ -8,9 +8,9 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
#include <vector>
-#include "base/memory/scoped_ptr.h"
#include "media/base/media_export.h"
#include "media/formats/mp4/bitstream_converter.h"
@@ -69,7 +69,7 @@ class MEDIA_EXPORT AVC {
class AVCBitstreamConverter : public BitstreamConverter {
public:
explicit AVCBitstreamConverter(
- scoped_ptr<AVCDecoderConfigurationRecord> avc_config);
+ std::unique_ptr<AVCDecoderConfigurationRecord> avc_config);
// BitstreamConverter interface
bool ConvertFrame(std::vector<uint8_t>* frame_buf,
@@ -78,7 +78,7 @@ class AVCBitstreamConverter : public BitstreamConverter {
private:
~AVCBitstreamConverter() override;
- scoped_ptr<AVCDecoderConfigurationRecord> avc_config_;
+ std::unique_ptr<AVCDecoderConfigurationRecord> avc_config_;
};
} // namespace mp4

Powered by Google App Engine
This is Rietveld 408576698