Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2463)

Unified Diff: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

Issue 1067803002: Roll WebRTC 8931:8933, Libjingle 8930:8932 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove NativeHandleImpl Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index 024c2b1ea6585360bfd9c2ce016e731ff302ad24..370de9ac29de9129055574a36d9129138e1f2b06 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -65,9 +65,7 @@ class VideoFrameWrapper : public webrtc::VideoFrameBuffer {
return frame_->stride(WebRtcToMediaPlaneType(type));
}
- rtc::scoped_refptr<webrtc::NativeHandle> native_handle() const override {
- return nullptr;
- }
+ void* native_handle() const override { return nullptr; }
~VideoFrameWrapper() override {}
friend class rtc::RefCountedObject<VideoFrameWrapper>;
« no previous file with comments | « content/renderer/media/webrtc/media_stream_remote_video_source.cc ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698