| Index: media/base/video_frame_metadata.h
|
| diff --git a/media/base/video_frame_metadata.h b/media/base/video_frame_metadata.h
|
| index 12112a43ad0efc8969340ec539acf36698c8aafd..a4ae4e5074f0e7e152fc3931ac31e60696967a66 100644
|
| --- a/media/base/video_frame_metadata.h
|
| +++ b/media/base/video_frame_metadata.h
|
| @@ -131,6 +131,9 @@ class MEDIA_EXPORT VideoFrameMetadata {
|
| void MergeInternalValuesInto(base::DictionaryValue* out) const;
|
| void MergeInternalValuesFrom(const base::DictionaryValue& in);
|
|
|
| + // Merges internal values from |metadata_source|.
|
| + void MergeMetadataFrom(const VideoFrameMetadata* metadata_source);
|
| +
|
| private:
|
| const base::BinaryValue* GetBinaryValue(Key key) const;
|
|
|
|
|