| Index: media/base/video_frame_metadata.cc
|
| diff --git a/media/base/video_frame_metadata.cc b/media/base/video_frame_metadata.cc
|
| index 2ecf002550cd523d1c48dbee27144f5b47b9794d..6aa322669c822cbcc5b88a7ca57b31319fe2b385 100644
|
| --- a/media/base/video_frame_metadata.cc
|
| +++ b/media/base/video_frame_metadata.cc
|
| @@ -145,6 +145,11 @@ void VideoFrameMetadata::MergeInternalValuesFrom(
|
| dictionary_.MergeDictionary(&in);
|
| }
|
|
|
| +void VideoFrameMetadata::MergeMetadataFrom(
|
| + const VideoFrameMetadata* metadata_source) {
|
| + dictionary_.MergeDictionary(&metadata_source->dictionary_);
|
| +}
|
| +
|
| const base::BinaryValue* VideoFrameMetadata::GetBinaryValue(Key key) const {
|
| const base::Value* internal_value = nullptr;
|
| if (dictionary_.GetWithoutPathExpansion(ToInternalKey(key),
|
|
|