| Index: talk/media/webrtc/webrtcvideoengine2.h
|
| diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
|
| index 9d04526f4b33d305512c78c0960908876c1093eb..e961465f64b1545d5cd74143d9782435eacbdd8a 100644
|
| --- a/talk/media/webrtc/webrtcvideoengine2.h
|
| +++ b/talk/media/webrtc/webrtcvideoengine2.h
|
| @@ -267,11 +267,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();
|
|
|
| @@ -413,9 +414,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();
|
|
|
|
|