| Index: webrtc/media/engine/internalencoderfactory.h
|
| diff --git a/webrtc/media/engine/internalencoderfactory.h b/webrtc/media/engine/internalencoderfactory.h
|
| index 909fa0ff2f53175b465e2235d9b39974e94be19d..cfc61016c0e88dc8923fbc627b00df6e3fb7324c 100644
|
| --- a/webrtc/media/engine/internalencoderfactory.h
|
| +++ b/webrtc/media/engine/internalencoderfactory.h
|
| @@ -29,10 +29,6 @@ class InternalEncoderFactory : public WebRtcVideoEncoderFactory {
|
| void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
|
|
|
| private:
|
| - // Disable overloaded virtual function warning. TODO(magjed): Remove once
|
| - // http://crbug/webrtc/6402 is fixed.
|
| - using WebRtcVideoEncoderFactory::CreateVideoEncoder;
|
| -
|
| std::vector<cricket::VideoCodec> supported_codecs_;
|
| };
|
|
|
|
|