| Index: media/formats/mp4/hevc.h
|
| diff --git a/media/formats/mp4/hevc.h b/media/formats/mp4/hevc.h
|
| index cca74df881d19398fbf9c52dfd86a46c61ea2cdc..84275e2b1ce9d0681e58919056db113f29051a4f 100644
|
| --- a/media/formats/mp4/hevc.h
|
| +++ b/media/formats/mp4/hevc.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"
|
| #include "media/formats/mp4/box_definitions.h"
|
| @@ -93,7 +93,7 @@ class MEDIA_EXPORT HEVC {
|
| class HEVCBitstreamConverter : public BitstreamConverter {
|
| public:
|
| explicit HEVCBitstreamConverter(
|
| - scoped_ptr<HEVCDecoderConfigurationRecord> hevc_config);
|
| + std::unique_ptr<HEVCDecoderConfigurationRecord> hevc_config);
|
|
|
| // BitstreamConverter interface
|
| bool ConvertFrame(std::vector<uint8_t>* frame_buf,
|
| @@ -102,7 +102,7 @@ class HEVCBitstreamConverter : public BitstreamConverter {
|
|
|
| private:
|
| ~HEVCBitstreamConverter() override;
|
| - scoped_ptr<HEVCDecoderConfigurationRecord> hevc_config_;
|
| + std::unique_ptr<HEVCDecoderConfigurationRecord> hevc_config_;
|
| };
|
|
|
| } // namespace mp4
|
|
|