| Index: webrtc/media/engine/webrtcvideoframefactory.h
|
| diff --git a/webrtc/media/engine/webrtcvideoframefactory.h b/webrtc/media/engine/webrtcvideoframefactory.h
|
| index c1569969fb2fb677352755a8fb10eeba8c844b4a..39d813ff75417b6024c985dcac14bed36da77ca3 100644
|
| --- a/webrtc/media/engine/webrtcvideoframefactory.h
|
| +++ b/webrtc/media/engine/webrtcvideoframefactory.h
|
| @@ -20,6 +20,11 @@ struct CapturedFrame;
|
| // Creates instances of cricket::WebRtcVideoFrame.
|
| class WebRtcVideoFrameFactory : public VideoFrameFactory {
|
| public:
|
| + // Note: Overriding a method name overrides all overloaded versions.
|
| + // Without this using-declaration, we would hide the 5-argument
|
| + // method we want to inherit.
|
| + using VideoFrameFactory::CreateAliasedFrame;
|
| +
|
| VideoFrame* CreateAliasedFrame(const CapturedFrame* aliased_frame,
|
| int width,
|
| int height) const override;
|
|
|