Index: webrtc/media/devices/gtkvideorenderer.h |
diff --git a/webrtc/media/devices/gtkvideorenderer.h b/webrtc/media/devices/gtkvideorenderer.h |
index 7834f1bcf65cb68ba1a76c831e973ff0c4a704b7..63a3ea900b1145d17e27dfc421f25d86c7046b6b 100644 |
--- a/webrtc/media/devices/gtkvideorenderer.h |
+++ b/webrtc/media/devices/gtkvideorenderer.h |
@@ -17,22 +17,22 @@ |
#include <memory> |
#include "webrtc/base/basictypes.h" |
-// TODO(nisse): Temporarily; to be replaced with a forward declaration |
-// of webrtc::VideoFrame when dependency on cricket::VideoFrame is deleted. |
-#include "webrtc/media/base/videoframe.h" |
#include "webrtc/media/base/videosinkinterface.h" |
typedef struct _GtkWidget GtkWidget; // forward declaration, defined in gtk.h |
+namespace webrtc { |
+class VideoFrame; |
+} |
namespace cricket { |
-class GtkVideoRenderer : public rtc::VideoSinkInterface<VideoFrame> { |
+class GtkVideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> { |
public: |
GtkVideoRenderer(int x, int y); |
virtual ~GtkVideoRenderer(); |
// Implementation of VideoSinkInterface. |
- void OnFrame(const VideoFrame& frame) override; |
+ void OnFrame(const webrtc::VideoFrame& frame) override; |
private: |
bool SetSize(int width, int height); |