| Index: webrtc/media/engine/webrtcvideoengine2.h
|
| diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
|
| index 16b7cc51577f306433e353df2565a1e700459a13..8716a01449e7749e121bdafaeacd0f9b863b6ac3 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine2.h
|
| +++ b/webrtc/media/engine/webrtcvideoengine2.h
|
| @@ -192,7 +192,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
|
| rtc::Optional<VideoCodecSettings> codec;
|
| rtc::Optional<std::vector<webrtc::RtpExtension>> rtp_header_extensions;
|
| rtc::Optional<int> max_bandwidth_bps;
|
| - rtc::Optional<VideoOptions> options;
|
| rtc::Optional<webrtc::RtcpMode> rtcp_mode;
|
| };
|
|
|
| @@ -211,7 +210,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
|
| bool MuteStream(uint32_t ssrc, bool mute);
|
|
|
| void SetMaxSendBandwidth(int bps);
|
| - void SetOptions(const VideoOptions& options);
|
| + void SetOptions(uint32_t ssrc, const VideoOptions& options);
|
|
|
| void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config,
|
| const StreamParams& sp) const;
|
|
|