Index: webrtc/common_video/incoming_video_stream.cc |
diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc |
index 5082eb77b5c87baeed9843fdc9ab1865dc6eb815..28697ea484649ad18f33668cfeb8ab8c3be4a991 100644 |
--- a/webrtc/common_video/incoming_video_stream.cc |
+++ b/webrtc/common_video/incoming_video_stream.cc |
@@ -92,14 +92,16 @@ int32_t IncomingVideoStream::RenderFrame(const uint32_t stream_id, |
int32_t IncomingVideoStream::SetStartImage(const VideoFrame& video_frame) { |
pbos-webrtc
2016/02/09 15:18:14
Can we make this void?
nisse-webrtc
2016/02/09 15:31:33
Maybe. I have no idea what this code does or from
pbos-webrtc
2016/02/09 15:36:10
All of our error codes were int32 historically. We
|
rtc::CritScope csS(&thread_critsect_); |
- return start_image_.CopyFrame(video_frame); |
+ start_image_.CopyFrame(video_frame); |
+ return 0; |
} |
int32_t IncomingVideoStream::SetTimeoutImage(const VideoFrame& video_frame, |
const uint32_t timeout) { |
rtc::CritScope csS(&thread_critsect_); |
timeout_time_ = timeout; |
- return timeout_image_.CopyFrame(video_frame); |
+ timeout_image_.CopyFrame(video_frame); |
+ return 0; |
} |
void IncomingVideoStream::SetRenderCallback( |