From 37fd004c695aa32c36a504621d15b7859e47c69f Mon Sep 17 00:00:00 2001
From: "wu@webrtc.org" <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 24 Aug 2011 17:06:38 +0000
Subject: [PATCH] Remove the X11 headers we don't need. Review URL:
 http://webrtc-codereview.appspot.com/123003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@438 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../video_render/main/source/linux/video_x11_channel.cc      | 2 +-
 .../video_render/main/source/linux/video_x11_channel.h       | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/modules/video_render/main/source/linux/video_x11_channel.cc b/src/modules/video_render/main/source/linux/video_x11_channel.cc
index c87c5f0a29..e041b95f2e 100644
--- a/src/modules/video_render/main/source/linux/video_x11_channel.cc
+++ b/src/modules/video_render/main/source/linux/video_x11_channel.cc
@@ -24,7 +24,7 @@ static int dispCount = 0;
 
 VideoX11Channel::VideoX11Channel(WebRtc_Word32 id) :
     _crit(*CriticalSectionWrapper::CreateCriticalSection()),
-            _videoInterpolator(NULL), _display(NULL), _xvport(), _shminfo(),
+            _videoInterpolator(NULL), _display(NULL), _shminfo(),
             _image(NULL), _window(0L), _width(DEFAULT_RENDER_FRAME_WIDTH),
             _height(DEFAULT_RENDER_FRAME_HEIGHT), _outWidth(0), _outHeight(0),
             _xPos(0), _yPos(0), _prepared(false), _dispCount(0), _buffer(NULL),
diff --git a/src/modules/video_render/main/source/linux/video_x11_channel.h b/src/modules/video_render/main/source/linux/video_x11_channel.h
index 6cc73349b7..77d4f73a2d 100644
--- a/src/modules/video_render/main/source/linux/video_x11_channel.h
+++ b/src/modules/video_render/main/source/linux/video_x11_channel.h
@@ -14,15 +14,11 @@
 #include "video_render_defines.h"
 #include "vplib.h"
 
-#include <sys/ipc.h>
 #include <sys/shm.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/Xatom.h>
 #include <X11/extensions/XShm.h>
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvlib.h>
 
 namespace webrtc {
 class CriticalSectionWrapper;
@@ -74,7 +70,6 @@ private:
     VideoInterpolator* _videoInterpolator;
 
     Display* _display;
-    WebRtc_Word32 _xvport;
     XShmSegmentInfo _shminfo;
     XImage* _image;
     Window _window;