| Index: media/formats/webm/webm_cluster_parser.cc
|
| diff --git a/media/formats/webm/webm_cluster_parser.cc b/media/formats/webm/webm_cluster_parser.cc
|
| index 21c1895d658687f8f971e99df3b3bc5e31d49d98..2c6bf957a33cacc0825f62d0d82c85e9e2dd5c75 100644
|
| --- a/media/formats/webm/webm_cluster_parser.cc
|
| +++ b/media/formats/webm/webm_cluster_parser.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "media/formats/webm/webm_cluster_parser.h"
|
|
|
| +#include <memory>
|
| #include <utility>
|
| #include <vector>
|
|
|
| @@ -485,7 +486,7 @@ bool WebMClusterParser::OnBlock(bool is_simple_block,
|
| // Every encrypted Block has a signal byte and IV prepended to it. Current
|
| // encrypted WebM request for comments specification is here
|
| // http://wiki.webmproject.org/encryption/webm-encryption-rfc
|
| - scoped_ptr<DecryptConfig> decrypt_config;
|
| + std::unique_ptr<DecryptConfig> decrypt_config;
|
| int data_offset = 0;
|
| if (!encryption_key_id.empty() &&
|
| !WebMCreateDecryptConfig(
|
|
|