generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the X11 headers we don't need.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/123003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@438 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2011-08-24 17:06:38 +00:00
parent cf36b2aa9b
commit 37fd004c69
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/video_render/main/source/linux/video_x11_channel.cc
View File

@ -24,7 +24,7 @@ static int dispCount = 0;
VideoX11Channel::VideoX11Channel(WebRtc_Word32 id) : VideoX11Channel::VideoX11Channel(WebRtc_Word32 id) :
_crit(*CriticalSectionWrapper::CreateCriticalSection()), _crit(*CriticalSectionWrapper::CreateCriticalSection()),
_videoInterpolator(NULL), _display(NULL), _xvport(), _shminfo(), _videoInterpolator(NULL), _display(NULL), _shminfo(),
_image(NULL), _window(0L), _width(DEFAULT_RENDER_FRAME_WIDTH), _image(NULL), _window(0L), _width(DEFAULT_RENDER_FRAME_WIDTH),
_height(DEFAULT_RENDER_FRAME_HEIGHT), _outWidth(0), _outHeight(0), _height(DEFAULT_RENDER_FRAME_HEIGHT), _outWidth(0), _outHeight(0),
_xPos(0), _yPos(0), _prepared(false), _dispCount(0), _buffer(NULL), _xPos(0), _yPos(0), _prepared(false), _dispCount(0), _buffer(NULL),

5
src/modules/video_render/main/source/linux/video_x11_channel.h
View File

@ -14,15 +14,11 @@
#include "video_render_defines.h" #include "video_render_defines.h"
#include "vplib.h" #include "vplib.h"
#include <sys/ipc.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
namespace webrtc { namespace webrtc {
class CriticalSectionWrapper; class CriticalSectionWrapper;
@ -74,7 +70,6 @@ private:
VideoInterpolator* _videoInterpolator; VideoInterpolator* _videoInterpolator;
Display* _display; Display* _display;
WebRtc_Word32 _xvport;
XShmSegmentInfo _shminfo; XShmSegmentInfo _shminfo;
XImage* _image; XImage* _image;
Window _window; Window _window;