| Index: webrtc/media/engine/webrtcmediaengine.h
|
| diff --git a/webrtc/media/engine/webrtcmediaengine.h b/webrtc/media/engine/webrtcmediaengine.h
|
| index 19b7d222f2ea9c548b160e6fc2b7baac31c5fed6..8aad94ccdf8a697337ecff636d622afeb3a3a030 100644
|
| --- a/webrtc/media/engine/webrtcmediaengine.h
|
| +++ b/webrtc/media/engine/webrtcmediaengine.h
|
| @@ -37,14 +37,13 @@ class WebRtcMediaEngineFactory {
|
|
|
| // Verify that extension IDs are within 1-byte extension range and are not
|
| // overlapping.
|
| -bool ValidateRtpExtensions(const std::vector<RtpHeaderExtension>& extensions);
|
| +bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
|
|
|
| -// Convert cricket::RtpHeaderExtension:s to webrtc::RtpExtension:s, discarding
|
| -// any extensions not validated by the 'supported' predicate. Duplicate
|
| +// Discard any extensions not validated by the 'supported' predicate. Duplicate
|
| // extensions are removed if 'filter_redundant_extensions' is set, and also any
|
| -// mutually exclusive extensions (see implementation for details).
|
| +// mutually exclusive extensions (see implementation for details) are removed.
|
| std::vector<webrtc::RtpExtension> FilterRtpExtensions(
|
| - const std::vector<RtpHeaderExtension>& extensions,
|
| + const std::vector<webrtc::RtpExtension>& extensions,
|
| bool (*supported)(const std::string&),
|
| bool filter_redundant_extensions);
|
|
|
|
|