| Index: webrtc/media/base/hybriddataengine.h
|
| diff --git a/webrtc/media/base/hybriddataengine.h b/webrtc/media/base/hybriddataengine.h
|
| index 508210b8c5bb060afe8a7d2f2a885b11d1b6454a..341f054868053a9982d72523bcdd185a94b40fd6 100644
|
| --- a/webrtc/media/base/hybriddataengine.h
|
| +++ b/webrtc/media/base/hybriddataengine.h
|
| @@ -35,13 +35,14 @@ class HybridDataEngine : public DataEngineInterface {
|
| second_->data_codecs().end());
|
| }
|
|
|
| - virtual DataMediaChannel* CreateChannel(DataChannelType data_channel_type) {
|
| + virtual DataMediaChannel* CreateChannel(DataChannelType data_channel_type,
|
| + const MediaConfig& config) {
|
| DataMediaChannel* channel = NULL;
|
| if (first_) {
|
| - channel = first_->CreateChannel(data_channel_type);
|
| + channel = first_->CreateChannel(data_channel_type, config);
|
| }
|
| if (!channel && second_) {
|
| - channel = second_->CreateChannel(data_channel_type);
|
| + channel = second_->CreateChannel(data_channel_type, config);
|
| }
|
| return channel;
|
| }
|
|
|