Index: webrtc/modules/video_coding/timing.h |
diff --git a/webrtc/modules/video_coding/timing.h b/webrtc/modules/video_coding/timing.h |
index e593c9acbc35a7a1c3973d36a0274c161e880a84..a45eee38c6c8dae4d550df3623c48e2bcf0c75a5 100644 |
--- a/webrtc/modules/video_coding/timing.h |
+++ b/webrtc/modules/video_coding/timing.h |
@@ -28,7 +28,7 @@ |
// The primary timing component should be passed |
// if this is the dual timing component. |
explicit VCMTiming(Clock* clock, VCMTiming* master_timing = NULL); |
- virtual ~VCMTiming(); |
+ ~VCMTiming(); |
// Resets the timing to the initial state. |
void Reset(); |
@@ -69,11 +69,11 @@ |
// Returns the receiver system time when the frame with timestamp |
// frame_timestamp should be rendered, assuming that the system time currently |
// is now_ms. |
- virtual int64_t RenderTimeMs(uint32_t frame_timestamp, int64_t now_ms) const; |
+ int64_t RenderTimeMs(uint32_t frame_timestamp, int64_t now_ms) const; |
// Returns the maximum time in ms that we can wait for a frame to become |
// complete before we must pass it to the decoder. |
- virtual uint32_t MaxWaitingTime(int64_t render_time_ms, int64_t now_ms) const; |
+ uint32_t MaxWaitingTime(int64_t render_time_ms, int64_t now_ms) const; |
// Returns the current target delay which is required delay + decode time + |
// render delay. |