| Index: webrtc/media/base/videocapturer.h
|
| diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h
|
| index 15089a7dcb211a7a9df74e8c4a47abda71446efb..4585d8f6bafcffd2cbf12b38217cb25b78ad2a9e 100644
|
| --- a/webrtc/media/base/videocapturer.h
|
| +++ b/webrtc/media/base/videocapturer.h
|
| @@ -246,11 +246,6 @@ class VideoCapturer : public sigslot::has_slots<>,
|
| enable_video_adapter_ = enable_video_adapter;
|
| }
|
|
|
| - CoordinatedVideoAdapter* video_adapter() { return &video_adapter_; }
|
| - const CoordinatedVideoAdapter* video_adapter() const {
|
| - return &video_adapter_;
|
| - }
|
| -
|
| // Takes ownership.
|
| void set_frame_factory(VideoFrameFactory* frame_factory);
|
|
|
| @@ -286,6 +281,8 @@ class VideoCapturer : public sigslot::has_slots<>,
|
| // TODO(perkj): Remove once SignalVideoFrame is removed.
|
| void OnFrame(VideoCapturer* capturer, const VideoFrame* frame);
|
|
|
| + CoordinatedVideoAdapter* video_adapter() { return &video_adapter_; }
|
| +
|
| void SetCaptureState(CaptureState state);
|
|
|
| // Marshals SignalStateChange onto thread_.
|
|
|