| Index: media/webm/webm_cluster_parser.cc
|
| diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc
|
| index 20d131e9b7ee7ed0c369de744c257e1cb62b7edd..14a360d050d5ef148f2c8e08ba844bc8fa4310d7 100644
|
| --- a/media/webm/webm_cluster_parser.cc
|
| +++ b/media/webm/webm_cluster_parser.cc
|
| @@ -235,10 +235,15 @@ bool WebMClusterParser::OnBlock(int track_num, int timecode,
|
|
|
| scoped_array<uint8> counter_block(GenerateCounterBlock(iv));
|
| buffer->SetDecryptConfig(scoped_ptr<DecryptConfig>(new DecryptConfig(
|
| - video_encryption_key_id_.get(), video_encryption_key_id_size_,
|
| - counter_block.get(), DecryptConfig::kDecryptionKeySize,
|
| - data, kWebMHmacSize,
|
| - sizeof(iv))));
|
| + std::string(
|
| + reinterpret_cast<const char*>(video_encryption_key_id_.get()),
|
| + video_encryption_key_id_size_),
|
| + std::string(
|
| + reinterpret_cast<const char*>(counter_block.get()),
|
| + DecryptConfig::kDecryptionKeySize),
|
| + std::string(reinterpret_cast<const char*>(data), kWebMHmacSize),
|
| + sizeof(iv),
|
| + std::vector<SubsampleEntry>())));
|
| }
|
|
|
| buffer->SetTimestamp(timestamp);
|
|
|