From 3211934ebf7cac3e6df2cb4aacb6e47cc1cffe2b Mon Sep 17 00:00:00 2001 From: Per Date: Tue, 7 Apr 2015 13:03:30 +0200 Subject: [PATCH] Fix build breakage in WrappedI420Buffer::native_handle() Sorry... My cl broke the build since I had not properly rebased and tested. https://webrtc-codereview.appspot.com/43999004/ TBR=mflodman@webrtc.org BUG=1128 Review URL: https://webrtc-codereview.appspot.com/45019004 Cr-Commit-Position: refs/heads/master@{#8933} --- webrtc/common_video/interface/video_frame_buffer.h | 2 +- webrtc/common_video/video_frame_buffer.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/common_video/interface/video_frame_buffer.h b/webrtc/common_video/interface/video_frame_buffer.h index 90beb5b712..cf73ba1352 100644 --- a/webrtc/common_video/interface/video_frame_buffer.h +++ b/webrtc/common_video/interface/video_frame_buffer.h @@ -135,7 +135,7 @@ class WrappedI420Buffer : public webrtc::VideoFrameBuffer { uint8_t* data(PlaneType type) override; int stride(PlaneType type) const override; - rtc::scoped_refptr native_handle() const override; + void* native_handle() const override; private: friend class rtc::RefCountedObject; diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc index 254183f8d5..38d194982f 100644 --- a/webrtc/common_video/video_frame_buffer.cc +++ b/webrtc/common_video/video_frame_buffer.cc @@ -230,7 +230,7 @@ int WrappedI420Buffer::stride(PlaneType type) const { } } -rtc::scoped_refptr WrappedI420Buffer::native_handle() const { +void* WrappedI420Buffer::native_handle() const { return nullptr; }