| Index: webrtc/media/engine/fakewebrtcvideoengine.h
|
| diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
|
| index f95fa7bdd876ef27943c3fdd409e21e83aa1955b..081005d0f639c38b13c0928d135301976990031a 100644
|
| --- a/webrtc/media/engine/fakewebrtcvideoengine.h
|
| +++ b/webrtc/media/engine/fakewebrtcvideoengine.h
|
| @@ -247,10 +247,6 @@ 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_;
|
|
|