| Index: webrtc/pc/channel.h
|
| diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
|
| index 6ea54194fbb8bf908cfd9d2e52f6ed76f0a7819e..8919aeef26f3b18ec75a19de132d5e1f8a3a70b7 100644
|
| --- a/webrtc/pc/channel.h
|
| +++ b/webrtc/pc/channel.h
|
| @@ -542,7 +542,8 @@ class VideoChannel : public BaseChannel {
|
| return static_cast<VideoMediaChannel*>(BaseChannel::media_channel());
|
| }
|
|
|
| - bool SetSink(uint32_t ssrc, rtc::VideoSinkInterface<VideoFrame>* sink);
|
| + bool SetSink(uint32_t ssrc,
|
| + rtc::VideoSinkInterface<webrtc::VideoFrame>* sink);
|
| // Get statistics about the current media session.
|
| bool GetStats(VideoMediaInfo* stats);
|
|
|
| @@ -558,7 +559,7 @@ class VideoChannel : public BaseChannel {
|
| bool SetVideoSend(uint32_t ssrc,
|
| bool enable,
|
| const VideoOptions* options,
|
| - rtc::VideoSourceInterface<cricket::VideoFrame>* source);
|
| + rtc::VideoSourceInterface<webrtc::VideoFrame>* source);
|
| webrtc::RtpParameters GetRtpSendParameters(uint32_t ssrc) const;
|
| bool SetRtpSendParameters(uint32_t ssrc,
|
| const webrtc::RtpParameters& parameters);
|
|
|