| Index: webrtc/media/engine/fakewebrtcvideoengine.h
|
| diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
|
| index bbc93e0d4095ca5c77931764c88548cb887b0964..a6cfeb3edf83e43f4c46c799b88a9b849abcdfe3 100644
|
| --- a/webrtc/media/engine/fakewebrtcvideoengine.h
|
| +++ b/webrtc/media/engine/fakewebrtcvideoengine.h
|
| @@ -248,6 +248,10 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory {
|
| }
|
|
|
| private:
|
| + // Disable overloaded virtual function warning. TODO(magjed): Remove once
|
| + // http://crbug/webrtc/6402 is fixed.
|
| + using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
|
| +
|
| rtc::CriticalSection crit_;
|
| rtc::Event created_video_encoder_event_;
|
| std::vector<cricket::VideoCodec> codecs_;
|
|
|