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

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

Issue 1310213008: Roll WebRTC 9784:9787, Libjingle 9785:9787 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: custom change Created 5 years, 4 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
« no previous file with comments | « content/renderer/media/webrtc/webrtc_video_frame_adapter.h ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc/webrtc_video_frame_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_video_frame_adapter.cc b/content/renderer/media/webrtc/webrtc_video_frame_adapter.cc
index 9ff6f6d2840968a47c380e283057cc1b4d841c8c..28dc533871bcf711d8db0d29d02f34e49827ac62 100644
--- a/content/renderer/media/webrtc/webrtc_video_frame_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_frame_adapter.cc
@@ -43,11 +43,6 @@ const uint8_t* WebRtcVideoFrameAdapter::data(webrtc::PlaneType type) const {
return frame_->visible_data(WebRtcToMediaPlaneType(type));
}
-uint8_t* WebRtcVideoFrameAdapter::data(webrtc::PlaneType type) {
- NOTREACHED();
- return nullptr;
-}
-
int WebRtcVideoFrameAdapter::stride(webrtc::PlaneType type) const {
return frame_->stride(WebRtcToMediaPlaneType(type));
}
« no previous file with comments | « content/renderer/media/webrtc/webrtc_video_frame_adapter.h ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698