| commit | 3211934ebf7cac3e6df2cb4aacb6e47cc1cffe2b | [log] [tgz] |
|---|---|---|
| author | Per <perkj@chromium.org> | Tue Apr 07 13:03:30 2015 +0200 |
| committer | Per <perkj@chromium.org> | Tue Apr 07 11:03:38 2015 +0000 |
| tree | 9b6a5dc8eea7f4e0f53f846eaac575fb83125401 | |
| parent | 75db8612588b4fabdf1b05f4ab145f7737093b45 [diff] |
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}
diff --git a/webrtc/common_video/interface/video_frame_buffer.h b/webrtc/common_video/interface/video_frame_buffer.h index 90beb5b..cf73ba1 100644 --- a/webrtc/common_video/interface/video_frame_buffer.h +++ b/webrtc/common_video/interface/video_frame_buffer.h
@@ -135,7 +135,7 @@ uint8_t* data(PlaneType type) override; int stride(PlaneType type) const override; - rtc::scoped_refptr<NativeHandle> native_handle() const override; + void* native_handle() const override; private: friend class rtc::RefCountedObject<WrappedI420Buffer>;
diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc index 254183f..38d1949 100644 --- a/webrtc/common_video/video_frame_buffer.cc +++ b/webrtc/common_video/video_frame_buffer.cc
@@ -230,7 +230,7 @@ } } -rtc::scoped_refptr<NativeHandle> WrappedI420Buffer::native_handle() const { +void* WrappedI420Buffer::native_handle() const { return nullptr; }