From b64a32bf25367d3a32a081680cb9f1972e06759a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Wed, 21 Oct 2015 11:54:01 +0200 Subject: [PATCH] Remove old VideoFrame::Reset. Hopefully all external implementations are updated, I could build Chromium locally with this patch. This Reset implementation causes (for some mysterious reason) -WError=overloaded-virtual failures when trying to build libjingle APKs. R=guoweis@webrtc.org, magjed@webrtc.org, pthatcher@webrtc.org BUG=webrtc:2365 Review URL: https://codereview.webrtc.org/1411253002 . Cr-Commit-Position: refs/heads/master@{#10352} --- talk/media/base/videoframe.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/talk/media/base/videoframe.h b/talk/media/base/videoframe.h index 68367200bb..217732fa18 100644 --- a/talk/media/base/videoframe.h +++ b/talk/media/base/videoframe.h @@ -62,23 +62,6 @@ class VideoFrame { webrtc::VideoRotation rotation, bool apply_rotation) = 0; - // TODO(guoweis): Remove this once all external implementations are updated. - virtual bool Reset(uint32_t fourcc, - int w, - int h, - int dw, - int dh, - uint8_t* sample, - size_t sample_size, - size_t pixel_width, - size_t pixel_height, - int64_t time_stamp, - int rotation) { - return Reset(fourcc, w, h, dw, dh, sample, sample_size, pixel_width, - pixel_height, time_stamp, - static_cast(rotation), true); - } - // Basic accessors. // Note this is the width and height without rotation applied. virtual size_t GetWidth() const = 0;