libxv: Changes to 'upstream-unstable'
COPYING | 8 +-
Makefile.am | 6 +-
configure.ac | 84 +++++++++++++++----------------
include/X11/extensions/Xvlib.h | 66 ++++++++++++------------
man/XvGetStill.man | 4 -
man/XvQueryExtension.man | 4 -
man/xv-library-v2.2.txt | 60 +++++++++++-----------
src/Xv.c | 110 ++++++++++++++++++++---------------------
src/Xvlibint.h | 12 ++--
9 files changed, 174 insertions(+), 180 deletions(-)
New commits:
commit 0f4fa1820041394e879517abb49c0391ecc796f7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 21:25:38 2012 -0800
libXv 1.0.7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 630889e..d3ad5bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXv], [1.0.6],
+AC_INIT([libXv], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXv])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit de5e2271b54b7fe8bb3f8b66a70b5b87853f51a2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 21:45:11 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Xv.c b/src/Xv.c
index f9efb91..b081e8a 100644
--- a/src/Xv.c
+++ b/src/Xv.c
@@ -57,7 +57,7 @@ SOFTWARE.
static XExtensionInfo _xv_info_data;
static XExtensionInfo *xv_info = &_xv_info_data;
-static char *xv_extension_name = XvName;
+static const char *xv_extension_name = XvName;
#define XvCheckExtension(dpy, i, val) \
XextCheckExtension(dpy, i, xv_extension_name, val)
@@ -82,7 +82,7 @@ static XExtensionHooks xv_extension_hooks = {
};
-static char *xv_error_list[] =
+static const char *xv_error_list[] =
{
"BadPort", /* XvBadPort */
"BadEncoding", /* XvBadEncoding */
commit ff45155aa59c22aa5abc5ffe941dfe3b0f4c288f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 5 20:59:37 2011 -0700
XvQueryExtension doesn't return XvBadAlloc
https://bugs.freedesktop.org/show_bug.cgi?id=22829
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/man/XvQueryExtension.man b/man/XvQueryExtension.man
index 4cce6dc..56a0826 100644
--- a/man/XvQueryExtension.man
+++ b/man/XvQueryExtension.man
@@ -44,9 +44,5 @@ Returned if
completed successfully.
.IP [XvBadExtension] 8
Returned if the Xv video extension is not available for the named display.
-.IP [XvBadAlloc] 8
-Returned if
-.BR XvQueryExtension (__libmansuffix__)
-failed to allocate memory to process the request.
.SH SEE ALSO
.BR Xv (__libmansuffix__)
commit 21ce77de0fc1b92bb55699df7e93dd1aae988fc5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:56:12 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index 7f66edf..83b3df2 100644
--- a/COPYING
+++ b/COPYING
@@ -3,13 +3,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/Makefile.am b/Makefile.am
index eba7178..909cef5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/include/X11/extensions/Xvlib.h b/include/X11/extensions/Xvlib.h
index 0708616..313037a 100644
--- a/include/X11/extensions/Xvlib.h
+++ b/include/X11/extensions/Xvlib.h
@@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -25,11 +25,11 @@ SOFTWARE.
#ifndef XVLIB_H
#define XVLIB_H
/*
-** File:
+** File:
**
** Xvlib.h --- Xv library public header file
**
-** Author:
+** Author:
**
** David Carver (Digital Workstation Engineering/Project Athena)
**
@@ -132,14 +132,14 @@ typedef struct {
/* for RGB formats only */
int depth;
- unsigned int red_mask;
- unsigned int green_mask;
- unsigned int blue_mask;
+ unsigned int red_mask;
+ unsigned int green_mask;
+ unsigned int blue_mask;
/* for YUV formats only */
unsigned int y_sample_bits;
unsigned int u_sample_bits;
- unsigned int v_sample_bits;
+ unsigned int v_sample_bits;
unsigned int horz_y_period;
unsigned int horz_u_period;
unsigned int horz_v_period;
@@ -148,7 +148,7 @@ typedef struct {
unsigned int vert_v_period;
char component_order[32]; /* eg. UYVY */
int scanline_order; /* XvTopToBottom, XvBottomToTop */
-} XvImageFormatValues;
+} XvImageFormatValues;
typedef struct {
int id;
@@ -158,7 +158,7 @@ typedef struct {
int *pitches; /* bytes */
int *offsets; /* bytes */
char *data;
- XPointer obdata;
+ XPointer obdata;
} XvImage;
_XFUNCPROTOBEGIN
@@ -168,7 +168,7 @@ extern int XvQueryExtension(
unsigned int* /* p_version */,
unsigned int* /* p_revision */,
unsigned int* /* p_requestBase */,
- unsigned int* /* p_eventBase */,
+ unsigned int* /* p_eventBase */,
unsigned int* /* p_errorBase */
);
@@ -191,11 +191,11 @@ extern int XvPutVideo(
XvPortID /* port */,
Drawable /* d */,
GC /* gc */,
- int /* vx */,
+ int /* vx */,
int /* vy */,
- unsigned int /* vw */,
+ unsigned int /* vw */,
unsigned int /* vh */,
- int /* dx */,
+ int /* dx */,
int /* dy */,
unsigned int /* dw */,
unsigned int /* dh */
@@ -206,11 +206,11 @@ extern int XvPutStill(
XvPortID /* port */,
Drawable /* d */,
GC /* gc */,
- int /* vx */,
+ int /* vx */,
int /* vy */,
- unsigned int /* vw */,
+ unsigned int /* vw */,
unsigned int /* vh */,
- int /* dx */,
+ int /* dx */,
int /* dy */,
unsigned int /* dw */,
unsigned int /* dh */
@@ -221,11 +221,11 @@ extern int XvGetVideo(
XvPortID /* port */,
Drawable /* d */,
GC /* gc */,
- int /* vx */,
+ int /* vx */,
int /* vy */,
- unsigned int /* vw */,
+ unsigned int /* vw */,
unsigned int /* vh */,
- int /* dx */,
+ int /* dx */,
int /* dy */,
unsigned int /* dw */,
unsigned int /* dh */
@@ -236,11 +236,11 @@ extern int XvGetStill(
XvPortID /* port */,
Drawable /* d */,
GC /* gc */,
- int /* vx */,
+ int /* vx */,
int /* vy */,
- unsigned int /* vw */,
+ unsigned int /* vw */,
unsigned int /* vh */,
- int /* dx */,
+ int /* dx */,
int /* dy */,
unsigned int /* dw */,
unsigned int /* dh */
@@ -294,11 +294,11 @@ extern int XvQueryBestSize(
Display* /* display */,
XvPortID /* port */,
Bool /* motion */,
- unsigned int /* vid_w */,
+ unsigned int /* vid_w */,
unsigned int /* vid_h */,
- unsigned int /* drw_w */,
+ unsigned int /* drw_w */,
unsigned int /* drw_h */,
- unsigned int* /* p_actual_width */,
+ unsigned int* /* p_actual_width */,
unsigned int* /* p_actual_width */
);
@@ -329,8 +329,8 @@ extern XvImage * XvCreateImage (
XvPortID port,
int id,
char *data,
- int width,
- int height
+ int width,
+ int height
);
extern int XvPutImage (
@@ -343,7 +343,7 @@ extern int XvPutImage (
int src_y,
unsigned int src_w,
unsigned int src_h,
- int dest_x,
+ int dest_x,
int dest_y,
unsigned int dest_w,
unsigned int dest_h
@@ -359,7 +359,7 @@ extern int XvShmPutImage (
int src_y,
unsigned int src_w,
unsigned int src_h,
- int dest_x,
+ int dest_x,
int dest_y,
unsigned int dest_w,
unsigned int dest_h,
@@ -371,7 +371,7 @@ extern XvImage * XvShmCreateImage (
XvPortID port,
int id,
char* data,
- int width,
+ int width,
int height,
XShmSegmentInfo *shminfo
);
diff --git a/man/XvGetStill.man b/man/XvGetStill.man
index 7c3f92d..98aa0e8 100644
--- a/man/XvGetStill.man
+++ b/man/XvGetStill.man
@@ -52,13 +52,13 @@ define the width and height, in pixels, of the drawable region.
.\"
.PN XvGetStill
captures a single frame of video from a drawable. The
-position and size of the destination (video) rectangle is specified by
+position and size of the destination (video) rectangle is specified by
.IR vx ,
.IR vy ,
.IR vw ,
and
.IR vh .
-The position and size of the source (drawable) rectangle is specified by
+The position and size of the source (drawable) rectangle is specified by
.IR dx ,
.IR dy ,
.IR dw ,
diff --git a/man/xv-library-v2.2.txt b/man/xv-library-v2.2.txt
index 41e7cbd..a8807db 100644
--- a/man/xv-library-v2.2.txt
+++ b/man/xv-library-v2.2.txt
@@ -13,7 +13,7 @@ Addendum to the Xv Client library documentation
port attributes.
typedef struct {
- int flags;
+ int flags;
int min_value;
int max_value;
char *name;
@@ -47,7 +47,7 @@ alternate colorspaces (XvImages) in the following way.
Xv Adaptors which are capable of displaying XvImages will have
the XvImageMask field set in the type field of the XvAdaptorInfo.
- XvImage formats supported by the port may be queried with
+ XvImage formats supported by the port may be queried with
XvListImageFormats().
XvImages may be created with the help of XvCreateImage() or
@@ -73,14 +73,14 @@ typedef struct {
/* for RGB formats */
int depth;
- unsigned int red_mask;
- unsigned int green_mask;
- unsigned int blue_mask;
+ unsigned int red_mask;
+ unsigned int green_mask;
+ unsigned int blue_mask;
/* for YUV formats */
unsigned int y_sample_bits;
unsigned int u_sample_bits;
- unsigned int v_sample_bits;
+ unsigned int v_sample_bits;
unsigned int horz_y_period;
unsigned int horz_u_period;
unsigned int horz_v_period;
@@ -89,7 +89,7 @@ typedef struct {
unsigned int vert_v_period;
char component_order[32]; /* eg. UYVY */
int scanline_order; /* XvTopToBottom, XvBottomToTop */
-} XvImageFormatValues;
+} XvImageFormatValues;
id - A unique descriptor for the format. This is often the FOURCC
@@ -100,9 +100,9 @@ typedef struct {
byte_order - The byte order of the image. It is either LSBFirst
or MSBFirst.
-
+
guid - The Globally Unique IDentifier (also known as Universally Unique
- IDentifier). When not applicable, all characters are NULL.
+ IDentifier). When not applicable, all characters are NULL.
bits_per_pixel - The bits taken up (but not necessarily used) by each
pixel. Note that for some planar formats which have
@@ -122,7 +122,7 @@ typedef struct {
?_sample_bits - The size of each sample in bits (YUV formats only).
horz_?_period, vert_?_period - The period (in pixels) on which samples
- occur in the horizontal and vertical
+ occur in the horizontal and vertical
directions (YUV formats only).
component_order - Upper case ascii characters representing the order
@@ -134,7 +134,7 @@ typedef struct {
Note: Since some formats (particularly some planar YUV formats) may not
be completely defined by the parameters above, the guid, when
- available, should provide the most accurate description of the
+ available, should provide the most accurate description of the
format.
@@ -145,9 +145,9 @@ XvImageFormatValues * XvListImageFormats (
int *count_return
);
- Returns the XvImageFormatValues supported by the specified port.
+ Returns the XvImageFormatValues supported by the specified port.
This list should be freed with XFree().
-
+
typedef struct {
int id;
@@ -156,12 +156,12 @@ typedef struct {
int num_planes;
int *pitches;
int *offsets;
- char *data;
- XPointer obdata;
+ char *data;
+ XPointer obdata;
} XvImage;
id - XvImageFormatValues id.
-
+
width, height - The width and height of the image in pixels.
int data_size - The size of the data buffer in bytes.
@@ -177,7 +177,7 @@ typedef struct {
data - A pointer to the start of the data buffer.
obdata - A private field for holding SHM info. This field will be
- set up by the client libraries so the programmer will
+ set up by the client libraries so the programmer will
generally need not be concerned with this field.
XvImage * XvCreateImage (
@@ -185,8 +185,8 @@ XvImage * XvCreateImage (
XvPortID port,
int id,
char *data,
- int width,
- int height
+ int width,
+ int height
);
display - Specifies the connection to the Xserver.
@@ -201,10 +201,10 @@ XvImage * XvCreateImage (
allocate the XvImage structure and fill out all fields except for
"data". Width and height may be enlarged in some YUV formats.
The size of the data buffer that needs to be allocated will be
-give in the "data_size" field in the XvImage. Image data is
+give in the "data_size" field in the XvImage. Image data is
not allocated by this function. The client may pass a pointer
to the preallocated memory as "data" or may allocate the memory
-and fill in the XvImage structure's data field after the
+and fill in the XvImage structure's data field after the
"data_size" field has been filled out by the server. The XvImage
structure may be freed by XFree();
@@ -214,7 +214,7 @@ XvImage * XvShmCreateImage (
XvPortID port,
int id,
char* data,
- int width,
+ int width,
int height,
XShmSegmentInfo *shminfo
);
@@ -223,10 +223,10 @@ XvImage * XvShmCreateImage (
allocate the XvImage structure and fill out all fields except for
"data". Width and height may be enlarged in some YUV formats.
The size of the data buffer that needs to be allocated will be
-give in the "data_size" field in the XvImage. Image data is
+give in the "data_size" field in the XvImage. Image data is
not allocated by this function. The client may pass a pointer
to the preallocated memory as "data" or may allocate the memory
-and fill in the XvImage structure's data field after the
+and fill in the XvImage structure's data field after the
"data_size" field has been filled out by the server. The XvImage
structure may be freed by XFree();
@@ -241,7 +241,7 @@ XvPutImage (
int src_y,
unsigned int src_w,
unsigned int src_h,
- int dest_x,
+ int dest_x,
int dest_y,
unsigned int dest_w,
unsigned int dest_h,
@@ -257,7 +257,7 @@ XvShmPutImage (
int src_y,
unsigned int src_w,
unsigned int src_h,
- int dest_x,
+ int dest_x,
int dest_y,
unsigned int dest_w,
unsigned int dest_h,
@@ -269,13 +269,13 @@ XvShmPutImage (
id - The port id of a port on an XvImage capable adaptor.
d - The target drawable.
-
+
gc - the graphics context specifying the clip mask to use, if any.
image - A pointer to the XvImage to be displayed.
src_? - The portion of the XvImage to be displayed.
-
+
dest_? - The portion of the destination drawable to be filled by the image.
send_event - Indicates whether or not an XShmCompletionEvent should be
@@ -293,8 +293,8 @@ Some of the possible Errors:
BadMatch - Incompatible arguments such as a port that isn't capable
of displaying XvImages.
XvBadPort - The specified port does not exist.
- BadAlloc - The server was unable to allocate resources required
+ BadAlloc - The server was unable to allocate resources required
to complete the operation.
- BadValue - Some numeric value falls outside the range of the
+ BadValue - Some numeric value falls outside the range of the
values accepted by the request.
BadShmSegCode - An invalid shared memory segment.
diff --git a/src/Xv.c b/src/Xv.c
index 77378aa..f9efb91 100644
--- a/src/Xv.c
+++ b/src/Xv.c
@@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -22,11 +22,11 @@ SOFTWARE.
******************************************************************/
/*
-** File:
+** File:
**
** Xv.c --- Xv library extension module.
**
-** Author:
+** Author:
**
** David Carver (Digital Workstation Engineering/Project Athena)
**
@@ -82,7 +82,7 @@ static XExtensionHooks xv_extension_hooks = {
};
-static char *xv_error_list[] =
+static char *xv_error_list[] =
{
"BadPort", /* XvBadPort */
"BadEncoding", /* XvBadEncoding */
@@ -92,11 +92,11 @@ static char *xv_error_list[] =
static XEXT_GENERATE_CLOSE_DISPLAY (xv_close_display, xv_info)
-static XEXT_GENERATE_FIND_DISPLAY (xv_find_display, xv_info,
- xv_extension_name,
+static XEXT_GENERATE_FIND_DISPLAY (xv_find_display, xv_info,
+ xv_extension_name,
&xv_extension_hooks,
XvNumEvents, NULL)
-
+
static XEXT_GENERATE_ERROR_STRING (xv_error_string, xv_extension_name,
XvNumErrors, xv_error_list)
@@ -154,14 +154,14 @@ XvQueryAdaptors(
XvAdaptorInfo *pas, *pa;
XvFormat *pfs, *pf;
char *buffer;
- union
+ union
{
char *buffer;
char *string;
xvAdaptorInfo *pa;
xvFormat *pf;
} u;
-
+
XvCheckExtension(dpy, info, XvBadExtension);
LockDisplay(dpy);
@@ -254,7 +254,7 @@ XvQueryAdaptors(
pf->depth = u.pf->depth;
pf->visual_id = u.pf->visual;
pf++;
-
+
u.buffer += (sz_xvFormat + 3) & ~3;
}
@@ -296,7 +296,7 @@ XvFreeAdaptorInfo(XvAdaptorInfo *pAdaptors)
{
Xfree(pa->formats);
}
- }
+ }
Xfree(pAdaptors);
}
@@ -315,13 +315,13 @@ XvQueryEncodings(
char *name;
XvEncodingInfo *pes, *pe;
char *buffer;
- union
+ union
{
char *buffer;
char *string;
xvEncodingInfo *pe;
} u;
-
+
XvCheckExtension(dpy, info, XvBadExtension);
LockDisplay(dpy);
@@ -427,7 +427,7 @@ XvPutVideo(
XvPortID port,
Drawable d,
GC gc,
- int vx, int vy,
+ int vx, int vy,
unsigned int vw, unsigned int vh,
int dx, int dy,
unsigned int dw, unsigned int dh
@@ -438,7 +438,7 @@ XvPutVideo(
XvCheckExtension(dpy, info, XvBadExtension);
LockDisplay(dpy);
-
+
FlushGC(dpy, gc);
XvGetReq(PutVideo, req);
@@ -467,7 +467,7 @@ XvPutStill(
XvPortID port,
Drawable d,
GC gc,
- int vx, int vy,
+ int vx, int vy,
unsigned int vw, unsigned int vh,
int dx, int dy,
unsigned int dw, unsigned int dh
@@ -506,7 +506,7 @@ XvGetVideo(
XvPortID port,
Drawable d,
GC gc,
- int vx, int vy,
+ int vx, int vy,
unsigned int vw, unsigned int vh,
int dx, int dy,
unsigned int dw, unsigned int dh
@@ -545,7 +545,7 @@ XvGetStill(
XvPortID port,
Drawable d,
GC gc,
- int vx, int vy,
+ int vx, int vy,
unsigned int vw, unsigned int vh,
int dx, int dy,
unsigned int dw, unsigned int dh
@@ -620,7 +620,7 @@ XvGrabPort(
req->port = port;
req->time = time;
- if (_XReply (dpy, (xReply *) &rep, 0, xTrue) == 0)
+ if (_XReply (dpy, (xReply *) &rep, 0, xTrue) == 0)
rep.result = GrabSuccess;
result = rep.result;
@@ -755,7 +755,7 @@ XvGetPortAttribute (
}
*p_value = rep.value;
-
+
UnlockDisplay(dpy);
SyncHandle();
@@ -767,11 +767,11 @@ XvQueryBestSize(
Display *dpy,
XvPortID port,
Bool motion,
- unsigned int vid_w,
+ unsigned int vid_w,
unsigned int vid_h,
- unsigned int drw_w,
+ unsigned int drw_w,
unsigned int drw_h,
- unsigned int *p_actual_width,
+ unsigned int *p_actual_width,
unsigned int *p_actual_height
)
{
@@ -809,7 +809,7 @@ XvQueryBestSize(
}
-XvAttribute*
+XvAttribute*
XvQueryPortAttributes(Display *dpy, XvPortID port, int *num)
{
XExtDisplayInfo *info = xv_find_display(dpy);
@@ -841,12 +841,12 @@ XvQueryPortAttributes(Display *dpy, XvPortID port, int *num)
char* marker = (char*)(&ret[rep.num_attributes]);
xvAttributeInfo Info;
int i;
-
+
for(i = 0; i < rep.num_attributes; i++) {
_XRead(dpy, (char*)(&Info), sz_xvAttributeInfo);
- ret[i].flags = (int)Info.flags;
- ret[i].min_value = Info.min;
- ret[i].max_value = Info.max;
+ ret[i].flags = (int)Info.flags;
+ ret[i].min_value = Info.min;
+ ret[i].max_value = Info.max;
ret[i].name = marker;
_XRead(dpy, marker, Info.size);
marker += Info.size;
@@ -895,22 +895,22 @@ XvImageFormatValues * XvListImageFormats (
if((ret = Xmalloc(size))) {
xvImageFormatInfo Info;
int i;
-
+
for(i = 0; i < rep.num_formats; i++) {
_XRead(dpy, (char*)(&Info), sz_xvImageFormatInfo);
- ret[i].id = Info.id;
- ret[i].type = Info.type;
- ret[i].byte_order = Info.byte_order;
+ ret[i].id = Info.id;
+ ret[i].type = Info.type;
+ ret[i].byte_order = Info.byte_order;
memcpy(&(ret[i].guid[0]), &(Info.guid[0]), 16);
- ret[i].bits_per_pixel = Info.bpp;
- ret[i].format = Info.format;
- ret[i].num_planes = Info.num_planes;
- ret[i].depth = Info.depth;
- ret[i].red_mask = Info.red_mask;
- ret[i].green_mask = Info.green_mask;
- ret[i].blue_mask = Info.blue_mask;
- ret[i].y_sample_bits = Info.y_sample_bits;
- ret[i].u_sample_bits = Info.u_sample_bits;
+ ret[i].bits_per_pixel = Info.bpp;
+ ret[i].format = Info.format;
+ ret[i].num_planes = Info.num_planes;
+ ret[i].depth = Info.depth;
+ ret[i].red_mask = Info.red_mask;
+ ret[i].green_mask = Info.green_mask;
+ ret[i].blue_mask = Info.blue_mask;
+ ret[i].y_sample_bits = Info.y_sample_bits;
+ ret[i].u_sample_bits = Info.u_sample_bits;
ret[i].v_sample_bits = Info.v_sample_bits;
ret[i].horz_y_period = Info.horz_y_period;
ret[i].horz_u_period = Info.horz_u_period;
@@ -937,8 +937,8 @@ XvImage * XvCreateImage (
XvPortID port,
int id,
char *data,
- int width,
- int height
+ int width,
+ int height
) {
XExtDisplayInfo *info = xv_find_display(dpy);
xvQueryImageAttributesReq *req;
@@ -989,7 +989,7 @@ XvImage * XvShmCreateImage (
XvPortID port,
int id,
char *data,
- int width,
+ int width,
int height,
XShmSegmentInfo *shminfo
){
@@ -1012,7 +1012,7 @@ int XvPutImage (
int src_y,
unsigned int src_w,
unsigned int src_h,
- int dest_x,
+ int dest_x,
int dest_y,
unsigned int dest_w,
unsigned int dest_h
@@ -1049,7 +1049,7 @@ int XvPutImage (
/* Yes it's kindof lame that we are sending the whole thing,
but for video all of it may be needed even if displaying
- only a subsection, and I don't want to go through the
+ only a subsection, and I don't want to go through the
trouble of creating subregions to send */
Data(dpy, (char *)image->data, image->data_size);
@@ -1069,7 +1069,7 @@ int XvShmPutImage (
int src_y,
unsigned int src_w,
unsigned int src_h,
- int dest_x,
+ int dest_x,
int dest_y,
unsigned int dest_w,
unsigned int dest_h,
@@ -1082,7 +1082,7 @@ int XvShmPutImage (
XvCheckExtension(dpy, info, XvBadExtension);
LockDisplay(dpy);
-
+
FlushGC(dpy, gc);
XvGetReq(ShmPutImage, req);
@@ -1125,7 +1125,7 @@ xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire)
{
case XvVideoNotify:
re->xvvideo.type = event->u.u.type & 0x7f;
- re->xvvideo.serial =
+ re->xvvideo.serial =
_XSetLastRequestRead(dpy, (xGenericReply *)event);
re->xvvideo.send_event = ((event->u.u.type & 0x80) != 0);
re->xvvideo.display = dpy;
@@ -1136,7 +1136,7 @@ xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire)
break;
case XvPortNotify:
re->xvport.type = event->u.u.type & 0x7f;
- re->xvport.serial =
+ re->xvport.serial =
_XSetLastRequestRead(dpy, (xGenericReply *)event);
re->xvport.send_event = ((event->u.u.type & 0x80) != 0);
re->xvport.display = dpy;
@@ -1146,7 +1146,7 @@ xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire)
re->xvport.value = event->u.portNotify.value;
break;
default:
- return False;
+ return False;
}
return (True);
diff --git a/src/Xvlibint.h b/src/Xvlibint.h
index f08346a..f16a515 100644
--- a/src/Xvlibint.h
+++ b/src/Xvlibint.h
@@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -25,11 +25,11 @@ SOFTWARE.
#ifndef XVLIBINT_H
#define XVLIBINT_H
/*
-** File:
+** File:
**
** Xvlibint.h --- Xv library internal header file
**
-** Author:
+** Author:
**
** David Carver (Digital Workstation Engineering/Project Athena)
**
commit 7091e73f39b813adcc8fa5e61ad336ba063d7e00
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:45 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
No functional configuration changes
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
diff --git a/configure.ac b/configure.ac
index c2a3e28..630889e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,59 +1,58 @@
-dnl
-dnl Copyright 2005 Red Hat, Inc.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Red Hat not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission. Red Hat makes no
-dnl representations about the suitability of this software for any purpose. It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
+#
+# Copyright 2005 Red Hat, Inc.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Red Hat not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Red Hat makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
Reply to: