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

Unified Diff: webrtc/media/engine/fakewebrtcvideoengine.h

Issue 1944743002: Revert of Enable -Winconsistent-missing-override flag. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
« no previous file with comments | « webrtc/media/base/fakemediaengine.h ('k') | webrtc/media/engine/fakewebrtcvoiceengine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/fakewebrtcvideoengine.h
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
index f8b8cbb4925dea73253ea55144427ee9d7d6e8b0..b445d2181ba410afa153d0f983478c3a702451dc 100644
--- a/webrtc/media/engine/fakewebrtcvideoengine.h
+++ b/webrtc/media/engine/fakewebrtcvideoengine.h
@@ -182,8 +182,8 @@
num_created_encoders_(0),
encoders_have_internal_sources_(false) {}
- webrtc::VideoEncoder* CreateVideoEncoder(
- webrtc::VideoCodecType type) override {
+ virtual webrtc::VideoEncoder* CreateVideoEncoder(
+ webrtc::VideoCodecType type) {
rtc::CritScope lock(&crit_);
if (supported_codec_types_.count(type) == 0) {
return NULL;
@@ -203,7 +203,7 @@
return false;
}
- void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override {
+ virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) {
rtc::CritScope lock(&crit_);
encoders_.erase(
std::remove(encoders_.begin(), encoders_.end(), encoder),
@@ -211,12 +211,12 @@
delete encoder;
}
- const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs()
- const override {
+ virtual const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs()
+ const {
return codecs_;
}
- bool EncoderTypeHasInternalSource(
+ virtual bool EncoderTypeHasInternalSource(
webrtc::VideoCodecType type) const override {
return encoders_have_internal_sources_;
}
« no previous file with comments | « webrtc/media/base/fakemediaengine.h ('k') | webrtc/media/engine/fakewebrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698