Revert of Enable -Winconsistent-missing-override flag.

webrtc/video/vie_channel.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 63 matching lines @@
                          bool enable_fec,
                          int payload_type_red,
                          int payload_type_fec);
 
   RtpState GetRtpStateForSsrc(uint32_t ssrc) const;
 
 
   CallStatsObserver* GetStatsObserver();
 
   // Implements VCMReceiveCallback.
-  int32_t FrameToRender(VideoFrame& video_frame) override;  // NOLINT
+  virtual int32_t FrameToRender(VideoFrame& video_frame);  // NOLINT
 
   // Implements VCMReceiveCallback.
-  int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
+  virtual int32_t ReceivedDecodedReferenceFrame(
+      const uint64_t picture_id);
 
   // Implements VCMReceiveCallback.
   void OnIncomingPayloadType(int payload_type) override;
   void OnDecoderImplementationName(const char* implementation_name) override;
 
   // Implements VCMReceiveStatisticsCallback.
   void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override;
   void OnDiscardedPacketsUpdated(int discarded_packets) override;
   void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
 
   // Implements VCMDecoderTimingCallback.
-  void OnDecoderTiming(int decode_ms,
-                       int max_decode_ms,
-                       int current_delay_ms,
-                       int target_delay_ms,
-                       int jitter_buffer_ms,
-                       int min_playout_delay_ms,
-                       int render_delay_ms) override;
+  virtual void OnDecoderTiming(int decode_ms,
+                               int max_decode_ms,
+                               int current_delay_ms,
+                               int target_delay_ms,
+                               int jitter_buffer_ms,
+                               int min_playout_delay_ms,
+                               int render_delay_ms);
 
   // Implements FrameTypeCallback.
-  int32_t RequestKeyFrame() override;
+  virtual int32_t RequestKeyFrame();
 
   // Implements FrameTypeCallback.
-  int32_t SliceLossIndicationRequest(
-      const uint64_t picture_id) override;
+  virtual int32_t SliceLossIndicationRequest(
+      const uint64_t picture_id);
 
   // Implements VideoPacketRequestCallback.
   int32_t ResendPackets(const uint16_t* sequence_numbers,
                         uint16_t length) override;
 
   void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback);
 
   void RegisterRtcpPacketTypeCounterObserver(
       RtcpPacketTypeCounterObserver* observer);
   void RegisterReceiveStatisticsProxy(
@@ skipping 29 matching lines @@
 
   int max_nack_reordering_threshold_;
   I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_);
 
   int64_t last_rtt_ms_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_CHANNEL_H_