diff options
| -rw-r--r-- | include/X11/extensions/Xvlib.h | 48 | ||||
| -rw-r--r-- | man/XvGetPortAttribute.man | 4 | ||||
| -rw-r--r-- | man/XvGetStill.man | 4 | ||||
| -rw-r--r-- | man/XvVideoNotify.man | 4 | ||||
| -rw-r--r-- | src/Xv.c | 3 |
5 files changed, 9 insertions, 54 deletions
diff --git a/include/X11/extensions/Xvlib.h b/include/X11/extensions/Xvlib.h index 28e7ce4..faaf03b 100644 --- a/include/X11/extensions/Xvlib.h +++ b/include/X11/extensions/Xvlib.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/Xvlib.h,v 1.3 1999/12/11 19:28:48 mvojkovi Exp $ */ +/* $XFree86: xc/include/extensions/Xvlib.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ #ifndef XVLIB_H #define XVLIB_H @@ -164,36 +164,29 @@ typedef struct { _XFUNCPROTOBEGIN extern int XvQueryExtension( -#if NeedFunctionPrototypes Display* /* display */, unsigned int* /* p_version */, unsigned int* /* p_revision */, unsigned int* /* p_requestBase */, unsigned int* /* p_eventBase */, unsigned int* /* p_errorBase */ -#endif ); extern int XvQueryAdaptors( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, unsigned int* /* p_nAdaptors */, XvAdaptorInfo** /* p_pAdaptors */ -#endif ); extern int XvQueryEncodings( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, unsigned int* /* p_nEncoding */, XvEncodingInfo** /* p_pEncoding */ -#endif ); extern int XvPutVideo( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Drawable /* d */, @@ -206,11 +199,9 @@ extern int XvPutVideo( int /* dy */, unsigned int /* dw */, unsigned int /* dh */ -#endif ); extern int XvPutStill( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Drawable /* d */, @@ -223,11 +214,9 @@ extern int XvPutStill( int /* dy */, unsigned int /* dw */, unsigned int /* dh */ -#endif ); extern int XvGetVideo( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Drawable /* d */, @@ -240,11 +229,9 @@ extern int XvGetVideo( int /* dy */, unsigned int /* dw */, unsigned int /* dh */ -#endif ); extern int XvGetStill( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Drawable /* d */, @@ -257,69 +244,53 @@ extern int XvGetStill( int /* dy */, unsigned int /* dw */, unsigned int /* dh */ -#endif ); extern int XvStopVideo( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Drawable /* drawable */ -#endif ); extern int XvGrabPort( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Time /* time */ -#endif ); extern int XvUngrabPort( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Time /* time */ -#endif ); extern int XvSelectVideoNotify( -#if NeedFunctionPrototypes Display* /* display */, Drawable /* drawable */, Bool /* onoff */ -#endif ); extern int XvSelectPortNotify( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Bool /* onoff */ -#endif ); extern int XvSetPortAttribute( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Atom /* attribute */, int /* value */ -#endif ); extern int XvGetPortAttribute( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Atom /* attribute */, int* /* p_value */ -#endif ); extern int XvQueryBestSize( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, Bool /* motion */, @@ -329,52 +300,40 @@ extern int XvQueryBestSize( unsigned int /* drw_h */, unsigned int* /* p_actual_width */, unsigned int* /* p_actual_width */ -#endif ); extern XvAttribute* XvQueryPortAttributes( -#if NeedFunctionPrototypes Display* /* display */, XvPortID /* port */, int* /* number */ -#endif ); extern void XvFreeAdaptorInfo( -#if NeedFunctionPrototypes XvAdaptorInfo* /* adaptors */ -#endif ); extern void XvFreeEncodingInfo( -#if NeedFunctionPrototypes XvEncodingInfo* /* encodings */ -#endif ); extern XvImageFormatValues * XvListImageFormats ( -#if NeedFunctionPrototypes Display *display, XvPortID port_id, int *count_return -#endif ); extern XvImage * XvCreateImage ( -#if NeedFunctionPrototypes Display *display, XvPortID port, int id, char *data, int width, int height -#endif ); extern int XvPutImage ( -#if NeedFunctionPrototypes Display *display, XvPortID id, Drawable d, @@ -388,11 +347,9 @@ extern int XvPutImage ( int dest_y, unsigned int dest_w, unsigned int dest_h -#endif ); extern int XvShmPutImage ( -#if NeedFunctionPrototypes Display *display, XvPortID id, Drawable d, @@ -407,13 +364,11 @@ extern int XvShmPutImage ( unsigned int dest_w, unsigned int dest_h, Bool send_event -#endif ); #ifdef _XSHM_H_ extern XvImage * XvShmCreateImage ( -#if NeedFunctionPrototypes Display *display, XvPortID port, int id, @@ -421,7 +376,6 @@ extern XvImage * XvShmCreateImage ( int width, int height, XShmSegmentInfo *shminfo -#endif ); #endif diff --git a/man/XvGetPortAttribute.man b/man/XvGetPortAttribute.man index de1c21f..ceb0ca1 100644 --- a/man/XvGetPortAttribute.man +++ b/man/XvGetPortAttribute.man @@ -1,5 +1,5 @@ .TH XvGetPortAttribute 3X __vendorversion__ -.\" $XFree86: xc/doc/man/Xv/XvGetPortAttribute.man,v 1.6 2001/01/27 18:20:35 dawes Exp $ +.\" $XFree86: xc/doc/man/Xv/XvGetPortAttribute.man,v 1.7 2003/05/29 21:48:05 herrb Exp $ .SH Name XvGetPortAttribute \- return current port attribute value .\" @@ -14,7 +14,7 @@ XvGetPortAttribute \- return current port attribute value .br \fBAtom \fIattribute\fR; .br -\fBint \fI*p_vlaue\fR; +\fBint \fI*p_value\fR; .sp 1l .\" .SH Arguments diff --git a/man/XvGetStill.man b/man/XvGetStill.man index af3ec6d..5496bf1 100644 --- a/man/XvGetStill.man +++ b/man/XvGetStill.man @@ -1,5 +1,5 @@ .TH XvGetStill 3X __vendorversion__ -.\" $XFree86: xc/doc/man/Xv/XvGetStill.man,v 1.5 2001/01/27 18:20:36 dawes Exp $ +.\" $XFree86: xc/doc/man/Xv/XvGetStill.man,v 1.6 2003/05/29 21:48:05 herrb Exp $ .SH Name XvGetStill \- capture a single frame of video from a drawable .\" @@ -47,7 +47,7 @@ option has the format hostname:number. Using two colons (::) instead of one (:) indicates that DECnet is to be used for transport. .IP \fIport\fR 15 -Defines the port to which the still is outputed. +Defines the port to which the still is output'd. .IP \fId\fR 15 Defines the drawable from which the still is to be captured. Pixmaps are currently not supported. diff --git a/man/XvVideoNotify.man b/man/XvVideoNotify.man index 8a50b08..9525007 100644 --- a/man/XvVideoNotify.man +++ b/man/XvVideoNotify.man @@ -1,5 +1,5 @@ .TH XvVideoNotify 3X __vendorversion__ -.\" $XFree86: xc/doc/man/Xv/XvVideoNotify.man,v 1.5 2001/01/27 18:20:36 dawes Exp $ +.\" $XFree86: xc/doc/man/Xv/XvVideoNotify.man,v 1.6 2003/05/29 21:48:05 herrb Exp $ .SH Name XvVideoNotify \- event generated for video processing .\" @@ -49,7 +49,7 @@ The port processing the video for which the event was generated. .\" XvVideoNotify(3X) events are generated when video is started, stopped, preempted by another video -request, ignored because the port is grabbed by another client, or interruped +request, ignored because the port is grabbed by another client, or interrupted because of a hard transmission or reception error. .\" .SH See Also @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xv/Xv.c,v 1.16 2002/10/16 00:37:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xv/Xv.c,v 1.17 2003/04/28 16:56:27 dawes Exp $ */ /* ** File: ** @@ -267,6 +267,7 @@ XvQueryAdaptors( *p_nAdaptors = rep.num_adaptors; *p_pAdaptors = pas; + Xfree(buffer); UnlockDisplay(dpy); SyncHandle(); |