| Index: webrtc/modules/video_render/linux/video_render_linux_impl.cc
|
| diff --git a/webrtc/modules/video_render/linux/video_render_linux_impl.cc b/webrtc/modules/video_render/linux/video_render_linux_impl.cc
|
| index 7e53dfdf809e2a434d91f8e8f8fad7e2386b15a4..096d03df7578cd5c22232180d26fda986cf39f91 100644
|
| --- a/webrtc/modules/video_render/linux/video_render_linux_impl.cc
|
| +++ b/webrtc/modules/video_render/linux/video_render_linux_impl.cc
|
| @@ -77,19 +77,19 @@ int32_t VideoRenderLinuxImpl::ChangeWindow(void* window)
|
| return -1;
|
| }
|
|
|
| -VideoRenderCallback* VideoRenderLinuxImpl::AddIncomingRenderStream(
|
| - const uint32_t streamId,
|
| - const uint32_t zOrder,
|
| - const float left,
|
| - const float top,
|
| - const float right,
|
| - const float bottom)
|
| +rtc::VideoSinkInterface<VideoFrame>*
|
| +VideoRenderLinuxImpl::AddIncomingRenderStream(const uint32_t streamId,
|
| + const uint32_t zOrder,
|
| + const float left,
|
| + const float top,
|
| + const float right,
|
| + const float bottom)
|
| {
|
| WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, "%s",
|
| __FUNCTION__);
|
| CriticalSectionScoped cs(&_renderLinuxCritsect);
|
|
|
| - VideoRenderCallback* renderCallback = NULL;
|
| + rtc::VideoSinkInterface<VideoFrame>* renderCallback = NULL;
|
| if (_ptrX11Render)
|
| {
|
| VideoX11Channel* renderChannel =
|
| @@ -102,7 +102,7 @@ VideoRenderCallback* VideoRenderLinuxImpl::AddIncomingRenderStream(
|
| streamId);
|
| return NULL;
|
| }
|
| - renderCallback = (VideoRenderCallback *) renderChannel;
|
| + renderCallback = (rtc::VideoSinkInterface<VideoFrame> *) renderChannel;
|
| }
|
| else
|
| {
|
|
|