diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:26 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:26 +0000 |
| commit | 21632c5277db3c8d3ef16013adbbc92b2ff1f8be (patch) | |
| tree | d14dfd73ce9b1d6b8aaff21c214317498a05f122 | |
| parent | 204fb5fcf4292629677e3876bd449fb76e55fcdd (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
| -rw-r--r-- | include/X11/extensions/XvMClib.h | 4 | ||||
| -rw-r--r-- | src/XvMC.c | 2 | ||||
| -rw-r--r-- | src/XvMClibint.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/X11/extensions/XvMClib.h b/include/X11/extensions/XvMClib.h index 3ac1e79..c96583a 100644 --- a/include/X11/extensions/XvMClib.h +++ b/include/X11/extensions/XvMClib.h @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/include/extensions/XvMClib.h,v 1.1.4.1.4.2 2004/03/05 12:46:30 eich Exp $ */ /* $XFree86: xc/include/extensions/XvMClib.h,v 1.6 2001/11/14 21:54:37 mvojkovi Exp $ */ #ifndef _XVMCLIB_H_ @@ -10,7 +11,8 @@ _XFUNCPROTOBEGIN Bool XvMCQueryExtension (Display *display, int *eventBase, int *errBase); -Status XvMCQueryVersion (Display *display, int *major, int *minor); +Status XvMCQueryVersion (Display *display, int *major_versionp, + int *minor_versionp); XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num); @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.5 2002/10/16 00:37:33 dawes Exp $ */ +/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.4 2001/11/14 21:54:38 mvojkovi Exp $ */ #define NEED_REPLIES diff --git a/src/XvMClibint.h b/src/XvMClibint.h index 77f0641..1db3924 100644 --- a/src/XvMClibint.h +++ b/src/XvMClibint.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.5 2002/10/16 00:37:33 dawes Exp $ */ +/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.4 2001/07/25 15:04:54 dawes Exp $ */ #ifndef _XVMCLIBINT_H #define _XVMCLIBINT_H |