| Index: talk/media/webrtc/webrtcvideoengine2.h
 | 
| diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
 | 
| index 2b90953459fb849387925243ca4292ff94c579a0..263a93c7f0ba090a01aedf468ccefe68caf9736c 100644
 | 
| --- a/talk/media/webrtc/webrtcvideoengine2.h
 | 
| +++ b/talk/media/webrtc/webrtcvideoengine2.h
 | 
| @@ -268,11 +268,12 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
 | 
|     public:
 | 
|      WebRtcVideoSendStream(
 | 
|          webrtc::Call* call,
 | 
| +        const StreamParams& sp,
 | 
| +        const webrtc::VideoSendStream::Config& config,
 | 
|          WebRtcVideoEncoderFactory* external_encoder_factory,
 | 
|          const VideoOptions& options,
 | 
|          int max_bitrate_bps,
 | 
|          const Settable<VideoCodecSettings>& codec_settings,
 | 
| -        const StreamParams& sp,
 | 
|          const std::vector<webrtc::RtpExtension>& rtp_extensions);
 | 
|      ~WebRtcVideoSendStream();
 | 
|  
 | 
| @@ -414,9 +415,9 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
 | 
|      WebRtcVideoReceiveStream(
 | 
|          webrtc::Call* call,
 | 
|          const StreamParams& sp,
 | 
| +        const webrtc::VideoReceiveStream::Config& config,
 | 
|          WebRtcVideoDecoderFactory* external_decoder_factory,
 | 
|          bool default_stream,
 | 
| -        const webrtc::VideoReceiveStream::Config& config,
 | 
|          const std::vector<VideoCodecSettings>& recv_codecs);
 | 
|      ~WebRtcVideoReceiveStream();
 | 
|  
 | 
| 
 |