diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-04-17 15:32:49 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-04-17 15:32:58 +0100 |
| commit | 6668f68054cb33e0cd3425f5403d14092a4a17f8 (patch) | |
| tree | 626e49eb1fa753bf1d82705d90ea006d540c2434 /src/sna/sna_video.h | |
| parent | 1bf0d869ae07ffc5b9cd79904b421cd37997ae8c (diff) | |
| download | xorg-driver-xf86-video-intel-6668f68054cb33e0cd3425f5403d14092a4a17f8.tar.gz | |
Revert "xgvevent"
This reverts commit ddd75d6539dcf692cb76747cd63d1f301180f18a.
This is a WIP patch, not ready for upstream. The danger of mixing topic
branches.
Diffstat (limited to 'src/sna/sna_video.h')
| -rw-r--r-- | src/sna/sna_video.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/sna/sna_video.h b/src/sna/sna_video.h index d39fa5f2..2e7144ec 100644 --- a/src/sna/sna_video.h +++ b/src/sna/sna_video.h @@ -50,8 +50,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. } struct sna_video { - struct sna *sna; - int brightness; int contrast; int saturation; @@ -97,19 +95,10 @@ struct sna_video_frame { BoxRec src; }; -static inline XvScreenPtr to_xv(ScreenPtr screen) -{ - return dixLookupPrivate(&screen->devPrivates, XvGetScreenKey()); -} - void sna_video_init(struct sna *sna, ScreenPtr screen); XF86VideoAdaptorPtr sna_video_overlay_setup(struct sna *sna, ScreenPtr screen); XF86VideoAdaptorPtr sna_video_sprite_setup(struct sna *sna, ScreenPtr screen); -void sna_video_textured_setup(struct sna *sna, ScreenPtr screen); - -XvAdaptorPtr sna_xv_adaptor_alloc(struct sna *sna); -int sna_xv_alloc_port(unsigned long port, XvPortPtr in, XvPortPtr *out); -int sna_xv_free_port(XvPortPtr port); +XF86VideoAdaptorPtr sna_video_textured_setup(struct sna *sna, ScreenPtr screen); #define FOURCC_XVMC (('C' << 24) + ('M' << 16) + ('V' << 8) + 'X') |