Upate to libXvMC 1.0.7

This commit is contained in:
matthieu 2012-03-10 17:03:59 +00:00
parent 6938d0cb86
commit 5fa34673d3
19 changed files with 29988 additions and 21861 deletions

View File

@ -1,3 +1,86 @@
commit bcc4c4f3b7ad3c880e97f27951c97cb7ba856658
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 21:31:11 2012 -0800
libXvMC 1.0.7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4091e8b8b80e00b8abafdd630e5af8cab22d9054
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 21:47:20 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5d4953233392d22b8c92e64c23b5aa20df86e17c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:56:49 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>
commit 4f64c8dd12786f6b0ef1e4c8c8d992d43de6f895
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 5 11:56:54 2011 -0500
config: use Automake defaults when checking for library functions.
Which follows a uniform naming convention.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit a37fab2dde1cb4ea0fb93ed811b14b2be9e52566
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 5 11:18:21 2011 -0500
config: move wrapper in its own directory
This prevents the use of per-target compiler flags.
Makefiles are simpler.
The -D flags for the wrapper are moved with pre-precessor flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 3b4040904d8fd5b8c7a20b0b187d70a00dd452ef
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 7 10:30:12 2011 -0500
Fix whitespace issues
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit ac00a51c3106188aebc98ce5f480768dcd95da5f
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])
Update minimum version of util-macros to at least 1.8.
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
commit bdd949b7d163bd9542eed89cf8fdb42197f86975
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 97d0572191368f47854c795e524610e529787c85
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Aug 13 22:00:11 2010 -0700

View File

@ -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
@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
SUBDIRS = src include
SUBDIRS = src include wrapper
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xvmc.pc

View File

@ -14,9 +14,9 @@
@SET_MAKE@
#
#
# 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
@ -26,7 +26,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
@ -44,9 +44,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -61,8 +61,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/xvmc.pc.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
compile config.guess config.sub depcomp install-sh ltmain.sh \
missing
config.guess config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -119,6 +118,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -126,24 +126,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -152,6 +148,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -162,6 +159,7 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -169,11 +167,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -186,6 +189,7 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -193,13 +197,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XVMC_CFLAGS = @XVMC_CFLAGS@
XVMC_LIBS = @XVMC_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -240,7 +242,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = src include
SUBDIRS = src include wrapper
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xvmc.pc
dist_doc_DATA = XvMC_API.txt

View File

@ -14,7 +14,7 @@
XvMCSetAttribute.
fifth draft (6/26/01) - Change definition of XvMCCompositeSubpicture
plus some clarifications and fixed typographical errors.
sixth draft (9/24/01) - Added XVMC_SECOND_FIELD and removed
sixth draft (9/24/01) - Added XVMC_SECOND_FIELD and removed
XVMC_PROGRESSIVE_FRAME and XVMC_TOP_FIELD_FIRST flags.
seventh draft (10/26/01) - Added XVMC_INTRA_UNSIGNED option.
eighth draft (11/13/02) - Removed IQ level acceleration and
@ -31,12 +31,12 @@
/********************************************************************/
XvMC extends the X-Video extension (Xv) and makes use of the
familar concept of the XvPort. Ports have attributes that can be set
familar concept of the XvPort. Ports have attributes that can be set
and queried through Xv. In XvMC ports can also have hardware motion
compensation contexts created for use with them. Ports which support
XvImages (ie. they have an "XV_IMAGE" port encoding as described in
compensation contexts created for use with them. Ports which support
XvImages (ie. they have an "XV_IMAGE" port encoding as described in
the Xv version 2.2 API addendum) can be queried for the list of XvMCSurface
types they support. If they support any XvMCSurface types an
types they support. If they support any XvMCSurface types an
XvMCContext can be created for that port.
An XvMCContext describes the state of the motion compensation
@ -44,7 +44,7 @@
a single port, surface type, motion compensation type, width and
height combination. For example, a context might be created for a
particular port that does MPEG-2 motion compensation on 720 x 480
4:2:0 surfaces. Once the context is created, referencing it implies
4:2:0 surfaces. Once the context is created, referencing it implies
the port, surface type, size and the motion compensation type. Contexts
may be "direct" or "indirect". For indirect contexts the X server
renders all video using the data passed to it by the client. For
@ -61,11 +61,11 @@
in the video pipeline. Acceleration starting at the first point,
which we shall call the "Motion Compensation" level, begins after the
the inverse quantization and IDCT at the place where motion compensation
is to be applied. The second point, which we shall call the "IDCT"
is to be applied. The second point, which we shall call the "IDCT"
level, begins before the IDCT just after the inverse quantization.
Rendering is done by presenting the library with a target XvMCSurface
and up to two reference XvMCSurfaces for the motion compensation, a
and up to two reference XvMCSurfaces for the motion compensation, a
buffer of 8x8 blocks and a command buffer which describes how to
use the 8x8 blocks along with motion compensation vectors to construct
the data in the target XvMCSurface. When the pipeline starts at the
@ -80,7 +80,7 @@
/********************************************************************/
QUERYING THE EXTENSION
QUERYING THE EXTENSION
/********************************************************************/
@ -139,24 +139,24 @@ Status XvMCQueryVersion (Display *display, int *major, int *minor)
typedef struct {
int surface_type_id;
int chroma_format;
unsigned short max_width;
unsigned short max_height;
unsigned short max_width;
unsigned short max_height;
unsigned short subpicture_max_width;
unsigned short subpicture_max_height;
int mc_type;
int mc_type;
int flags;
} XvMCSurfaceInfo;
surface_type_id - Unique descriptor for this surface type.
chroma_format - Chroma format of this surface (eg. XVMC_CHROMA_FORMAT_420,
chroma_format - Chroma format of this surface (eg. XVMC_CHROMA_FORMAT_420,
XVMC_CHROMA_FORMAT_422, XVMC_CHROMA_FORMAT_444).
max_width -
max_height - Maximum dimensions of the luma data in pixels.
subpicture_max_width -
subpicture_max_height - The Maximum dimensions of the subpicture
subpicture_max_height - The Maximum dimensions of the subpicture
that can be created for use with this surface
Both fields are zero if subpictures are not
supported.
@ -169,7 +169,7 @@ typedef struct {
level;
XVMC_IDCT - Acceleration starts at the IDCT level.
flags - Any combination of the following may be OR'd together.
XVMC_OVERLAID_SURFACE - Displayed data is overlaid and not
@ -177,7 +177,7 @@ typedef struct {
When this is set the client is responsible
for painting the colorkey.
XVMC_BACKEND_SUBPICTURE - The supicture is of the "backend"
XVMC_BACKEND_SUBPICTURE - The supicture is of the "backend"
variety. It is "frontend" otherwise.
There is more information on this in the
section on subpictures below.
@ -195,8 +195,8 @@ typedef struct {
XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num)
Returns the number of surface types supported by the XvPort and an array
of XvMCSurfaceInfo describing each surface type. The returned array
Returns the number of surface types supported by the XvPort and an array
of XvMCSurfaceInfo describing each surface type. The returned array
should be freed with XFree().
dpy - The connection to the server.
@ -235,7 +235,7 @@ typedef struct {
surface_type_id - This refers to the XvMCSurfaceInfo that describes
the surface characteristics.
width -
height - The dimensions (of the luma data) this context supports.
@ -256,7 +256,7 @@ Status XvMCCreateContext (
XvMCContext * context
);
This creates a context by filling out the XvMCContext structure passed
This creates a context by filling out the XvMCContext structure passed
to it and returning Success.
display - Specifies the connection to the server.
@ -275,11 +275,11 @@ Status XvMCCreateContext (
XVMC_DIRECT - A direct context is requested.
If a direct context cannot be created the request
will not fail, rather, an indirect context will
will not fail, rather, an indirect context will
be created instead.
context - Pointer to the pre-allocated XvMCContext structure.
Errors:
@ -297,13 +297,13 @@ Status XvMCCreateContext (
Status XvMCDestroyContext (Display display, XvMCContext * context)
Destroys the specified context.
Destroys the specified context.
display - Specifies the connection to the server.
context - The context to be destroyed.
Errors:
Errors:
XvMCBadContext - The XvMCContext is not valid.
@ -315,7 +315,7 @@ Status XvMCDestroyContext (Display display, XvMCContext * context)
/*********************************************************************/
typedef struct {
XID surface_id;
XID surface_id;
XID context_id;
int surface_type_id;
unsigned short width;
@ -334,14 +334,14 @@ typedef struct {
height - The width and height of the luma data.
Status
Status
XvMCCreateSurface(
Display *display,
XvMCContext * context;
XvMCSurface * surface;
);
Creates a surface (Frame) for use with the specified context.
Creates a surface (Frame) for use with the specified context.
The surface structure is filled out and Success is returned if no
error occured.
@ -354,7 +354,7 @@ XvMCCreateSurface(
XvMCBadContext - the context is not valid.
BadAlloc - there are insufficient resources to complete
BadAlloc - there are insufficient resources to complete
this operation.
Status XvMCDestroySurface(Display *display, XvMCSurface *surface);
@ -391,7 +391,7 @@ typedef struct {
blocks - Pointer to an array of (64 * num_blocks) shorts.
Status XvMCCreateBlocks (
Display *display,
Display *display,
XvMCContext *context,
unsigned int num_blocks,
XvMCBlockArray * block
@ -408,12 +408,12 @@ Status XvMCCreateBlocks (
This number must be non-zero.
block - A pointer to a pre-allocated XvMCBlockArray structure.
Errors:
Errors:
XvMCBadContext - the context is invalid.
BadAlloc - There are insufficient resources to complete the
BadAlloc - There are insufficient resources to complete the
operation.
BadValue - num_blocks was zero.
@ -437,7 +437,7 @@ Status XvMCDestroyBlocks (Display *display, XvMCBlockArray * block)
#define XVMC_PREDICTION_FIELD 0x01
#define XVMC_PREDICTION_FRAME 0x02
#define XVMC_PREDICTION_DUAL_PRIME 0x03
#define XVMC_PREDICTION_16x8 0x02
#define XVMC_PREDICTION_16x8 0x02
#define XVMC_PREDICTION_4MV 0x04
#define XVMC_SELECT_FIRST_FORWARD 0x01
@ -452,7 +452,7 @@ typedef struct {
unsigned short x;
unsigned short y;
unsigned char macroblock_type;
unsigned char motion_type;
unsigned char motion_type;
unsigned char motion_vertical_field_select;
unsigned char dct_type;
short PMV[2][2][2];
@ -474,14 +474,14 @@ typedef struct {
the frame is not bidirectionally
predicted.
XVMC_MB_TYPE_PATTERN - Blocks are referenced and they contain
XVMC_MB_TYPE_PATTERN - Blocks are referenced and they contain
differentials. The coded_block_pattern will
indicate the number of blocks and index will
note their locations in the block array.
XVMC_MB_TYPE_INTRA - Blocks are referenced and they are intra blocks.
XVMC_MB_TYPE_INTRA - Blocks are referenced and they are intra blocks.
The coded_block_pattern will indicate the number
of blocks and index will note their locations in
of blocks and index will note their locations in
the block array. XVMC_MB_TYPE_PATTERN and
XVMC_MB_TYPE_INTRA are mutually exclusive. If
both are specified, XVMC_MB_TYPE_INTRA takes
@ -502,7 +502,7 @@ typedef struct {
XVMC_SELECT_FIRST_BACKWARD
XVMC_SELECT_SECOND_FORWARD
XVMC_SELECT_SECOND_BACKWARD
If the bit is set the bottom field is indicated.
If the bit is clear the top field is indicated.
@ -513,7 +513,7 @@ typedef struct {
|_______ Second vector backward
PMV - The motion vector(s)
PMV[c][b][a]
a - This holds the vector. 0 = horizontal, 1 = vertical.
@ -524,7 +524,7 @@ typedef struct {
or XVMC_MB_TYPE_MOTION_BACKWARD are set.
DualPrime vectors must be fully decoded and placed in the PMV
array as follows.
array as follows.
Field structure:
@ -532,7 +532,7 @@ typedef struct {
PMV[0][1][1:0] from opposite parity
Frame structure:
PMV[0][0][1:0] top from top
PMV[0][1][1:0] bottom from bottom
PMV[1][0][1:0] top from bottom
@ -545,7 +545,7 @@ typedef struct {
coded_block_pattern - Indicates the blocks to be updated. The bitplanes
are specific to the mc_type of the surface. This
field is valid only if XVMC_MB_TYPE_PATTERN or
field is valid only if XVMC_MB_TYPE_PATTERN or
XVMC_MB_TYPE_INTRA are set. In that case the blocks
are differential or intra blocks respectively.
The bitplanes are described in ISO/IEC 13818-2
@ -572,7 +572,7 @@ typedef struct {
Status XvMCCreateMacroBlocks (
Display *display,
Display *display,
XvMCContext *context,
unsigned int num_blocks,
XvMCMacroBlockArray * blocks
@ -589,12 +589,12 @@ Status XvMCCreateMacroBlocks (
This number must be non-zero.
blocks - A pointer to a pre-allocated XvMCMacroBlockArray structure.
Errors:
Errors:
XvMCBadContext - the context is invalid.
BadAlloc - There are insufficient resources to complete the
BadAlloc - There are insufficient resources to complete the
operation.
BadValue - num_blocks was zero.
@ -607,7 +607,7 @@ Status XvMCDestroyMacroBlocks (Display *display, XvMCMacroBlockArray * block)
block - The macro block array to be freed.
------------------------------------------------------------
#define XVMC_TOP_FIELD 0x00000001
@ -631,7 +631,7 @@ Status XvMCRenderSurface(
);
This function renders the macroblocks passed to it. It will not
return until it has read all of the macroblocks, however, rendering
return until it has read all of the macroblocks, however, rendering
will usually not be completed by that time. The return of this
function means it is safe to touch the blocks and macroblock_array.
To synchronize rendering see the section on sychronization below.
@ -644,7 +644,7 @@ Status XvMCRenderSurface(
past_surface -
furture_surface -
The target_surface is required. If the future and past
The target_surface is required. If the future and past
surfaces are NULL, the target_surface is an "Intra" frame.
If the past surface is provided but not the future surface,
@ -665,7 +665,7 @@ Status XvMCRenderSurface(
flags - Flags may include:
XVMC_SECOND_FIELD - For field pictures this indicates whether
the current field (top or bottom) is first
the current field (top or bottom) is first
or second in the sequence.
num_macroblocks - The number of XvMCMacroBlock structures to execute in
@ -684,8 +684,8 @@ Status XvMCRenderSurface(
Errors:
XvMCBadContext - The context is not valid.
XvMCBadSurface - Any of the surfaces are not valid.
XvMCBadSurface - Any of the surfaces are not valid.
BadMatch - Any of the surfaces do not belong to the specified
context or a future surface was specified without
@ -706,9 +706,9 @@ XvMCPutSurface(
Display *display,
XvMCSurface *surface,
Drawable draw,
short srcx,
short srcy,
unsigned short srcw,
short srcx,
short srcy,
unsigned short srcw,
unsigned short srch,
short destx,
short desty,
@ -719,7 +719,7 @@ XvMCPutSurface(
Display the rectangle from the source defined by srcx/y/w/h scaled
to destw by desth and placed at (destx, desty) on the given drawable.
This function is not guaranteed to be pipelined with previous rendering
This function is not guaranteed to be pipelined with previous rendering
commands and may display the surface immediately. Therefore, the client
must query that the surface has finished rendering before calling this
function.
@ -728,7 +728,7 @@ XvMCPutSurface(
surface - The surface to copy/overlay from.
draw - The drawable to copy/overlay the video on.
draw - The drawable to copy/overlay the video on.
srcx -
srcy -
@ -739,8 +739,8 @@ XvMCPutSurface(
destx -
desty -
destw -
desth - The rectangle in the destination drawable where the scaled
source rectangle should be displayed.
desth - The rectangle in the destination drawable where the scaled
source rectangle should be displayed.
flags - this indicates the field to be displayed and can be XVMC_TOP_FIELD,
XVMC_BOTTOM_FIELD or XVMC_FRAME_PICTURE. XVMC_FRAME_PICTURE
@ -757,14 +757,14 @@ Status XvMCHideSurface(Display *display, XvMCSurface *surface)
Stops display of a surface. This is only needed if the surface is an
overlaid surface as indicated in the XvMCSurfaceInfo - it is a no-op
otherwise.
otherwise.
display - The connection to the server.
surface - The surface to be hidden.
Errors:
XvMCBadSurface - The surface is not valid.
@ -789,20 +789,20 @@ XvImageFormatValues * XvMCListSubpictureTypes (
display - Specifies the connection to the X-server.
port - Specifies the port we are interested in.
surface_type_id - Specifies the surface type for which we want to
query the supported subpicture types.
surface_type_id - Specifies the surface type for which we want to
query the supported subpicture types.
count_return - the size of the returned array.
Errors:
BadPort - The port doesn't exist.
BadAlloc - There are insufficient resources to complete this request.
BadMatch - The surface type is not supported on that port.
BadMatch - The surface type is not supported on that port.
typedef struct {
XID subpicture_id;
@ -816,7 +816,7 @@ typedef struct {
void *privData; /* private to the library */
} XvMCSubpicture;
subpicture_id - An XID associated with this subpicture.
context_id - The XID of the context this subpicture was created for.
@ -830,21 +830,21 @@ typedef struct {
num_palette_entries - For paletted formats only. This is the number
of palette entries. It is zero for XvImages
without palettes.
entry_bytes - Each component is one byte and entry_bytes indicates
the number of components in each entry (eg. 3 for
YUV palette entries). This field is zero when
palettes are not used.
YUV palette entries). This field is zero when
palettes are not used.
component_order - Is an array of ascii characters describing the order
of the components within the bytes. Only entry_bytes
characters of the string are used.
characters of the string are used.
Status
XvMCCreateSubpicture (
Display *display,
Display *display,
XvMCContext *context,
XvMCSubpicture *subpicture,
XvMCSubpicture *subpicture,
unsigned short width,
unsigned short height,
int xvimage_id
@ -854,15 +854,15 @@ XvMCCreateSubpicture (
passed to it and returning Success.
display - Specifies the connection to the X-Server.
context - The context to create the subpicture for.
subpicture - Pre-allocated XvMCSubpicture structure to be filled
subpicture - Pre-allocated XvMCSubpicture structure to be filled
out by this function.
width -
height - The dimensions of the subpicture.
xvimage_id - The id describing the XvImage format.
@ -873,7 +873,7 @@ XvMCCreateSubpicture (
XvMCBadContext - The specified context does not exist.
BadMatch - The XvImage format id specified is not supported by
the context.
the context.
BadValue - If the size requested is larger than the max size reported
in the XvMCSurfaceInfo.
@ -901,7 +901,7 @@ XvMCClearSubpicture (
width -
height - The rectangle in the subpicture to be cleared.
color - The data to fill the rectangle with.
color - The data to fill the rectangle with.
Errors:
@ -920,14 +920,14 @@ XvMCCompositeSubpicture (
short dsty
)
Copies the XvImage to the XvMCSubpicture.
Copies the XvImage to the XvMCSubpicture.
display - The connection to the server.
subpicture - The subpicture used as the destination of the copy.
subpicture - The subpicture used as the destination of the copy.
image - The XvImage to be used as the source of the copy.
XvImages should be of the shared memory variety for
image - The XvImage to be used as the source of the copy.
XvImages should be of the shared memory variety for
indirect contexts.
srcx -
@ -937,7 +937,7 @@ XvMCCompositeSubpicture (
dstx -
dsty - The location in the subpicture where the source rectangle
should be composited.
should be composited.
Errors:
@ -956,37 +956,37 @@ XvMCDestroySubpicture (Display *display, XvMCSubpicture *subpicture)
subpicture - The subpicture to be destroyed.
Errors:
XvMCBadSubpicture - The subpicture specified does not exist.
Status
XvMCSetSubpicturePalette (
Display *display,
XvMCSubpicture *subpicture,
Display *display,
XvMCSubpicture *subpicture,
unsigned char *palette
)
Set the subpicture's palette. This applies to paletted subpictures
only.
only.
display - The connection to the server.
subpicture - The subpicture on which to change the palette.
palette - A pointer to an array holding the palette data. The
size of this array is
size of this array is
num_palette_entries * entry_bytes
in size. The order of the components in the palette
is described by the component_order in the XvMCSubpicture
structure.
structure.
Errors:
XvMCBadSubpicture - The subpicture specified does not exist.
BadMatch - The specified subpicture does not use palettes.
@ -1033,7 +1033,7 @@ or not the XVMC_BACKEND_SUBPICTURE flag is set in the XvMCSurfaceInfo.
the call to XvMCPutSurface until they are no longer displaying. It is
safe to associate the subpicture and target_surface before rendering has
completed (while they still query XVMC_RENDERING) but it is not safe to
call XvMCPutSurface at that time.
call XvMCPutSurface at that time.
XvMCBlendSubpicture2 copies the source_surface to the target_surface
and associates the subpicture with the target_surface. This essentially
@ -1073,8 +1073,8 @@ or not the XVMC_BACKEND_SUBPICTURE flag is set in the XvMCSurfaceInfo.
surfw -
surfh - The rectangle in the XvMCSurface to blend the subpicture rectangle
into. If XVMC_SUBPICTURE_INDEPENDENT_SCALING is not set in the
XvMCSurfaceInfo subw must be equal to surfw and subh must be
equal to surfh height or else a BadValue error occurs.
XvMCSurfaceInfo subw must be equal to surfw and subh must be
equal to surfh height or else a BadValue error occurs.
Errors:
@ -1103,7 +1103,7 @@ Status
XvMCSyncSurface (Display *display, XvMCSurface *surface)
This function blocks until all rendering requests on the surface
have been completed.
have been completed.
display - The connection to the server.
@ -1116,9 +1116,9 @@ XvMCSyncSurface (Display *display, XvMCSurface *surface)
Status
XvMCFlushSurface (Display *display, XvMCSurface *surface)
This function commits pending rendering requests to ensure that
they will be completed in a finite amount of time.
they will be completed in a finite amount of time.
display - The connnection to the server.
@ -1133,7 +1133,7 @@ Status
XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat)
display - The connection to the server.
surface - The surface whos status is being queried.
stat - May be any of the following OR'd together:
@ -1160,7 +1160,7 @@ XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat)
Status
XvMCSyncSubpicture (Display *display, XvMCSubpicture *subpicture)
This function blocks until all composite/clear requests on the supicture
have been completed.
@ -1175,9 +1175,9 @@ XvMCSyncSubpicture (Display *display, XvMCSubpicture *subpicture)
Status
XvMCFlushSubpicture (Display *display, XvMCSubpicture *subpicture)
This function commits pending composite/clear requests to ensure that
they will be completed in a finite amount of time.
they will be completed in a finite amount of time.
display - The connection to the server.
@ -1193,11 +1193,11 @@ XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat)
display - The connection to the server.
subpic - The subpicture whos status is being queried.
subpic - The subpicture whos status is being queried.
stat - may be any of the following OR'd together:
XVMC_RENDERING - The last XvMCCompositeSubpicture or XvMCClearSubpicture
XVMC_RENDERING - The last XvMCCompositeSubpicture or XvMCClearSubpicture
request has not completed yet.
XVMC_DISPLAYING - The subpicture is currently being displayed or a
@ -1215,7 +1215,7 @@ XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat)
/********************************************************************/
Context specific attribute functions are provided. These are
similar to their Xv Counterparts XvQueryPortAttributes, XvSetPortAttribute
similar to their Xv Counterparts XvQueryPortAttributes, XvSetPortAttribute
and XvGetPortAttribute but their state is specific to the context.
XvAttribute *
@ -1242,8 +1242,8 @@ XvMCQueryAttributes (
Status
XvMCSetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
XvMCContext *context,
Atom attribute,
int value
)
@ -1269,8 +1269,8 @@ XvMCSetAttribute (
Status
XvMCGetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
XvMCContext *context,
Atom attribute,
int *value
)
@ -1279,11 +1279,11 @@ XvMCGetAttribute (
display - The connection to the server.
context - The context whos attribute we are querying.
context - The context whos attribute we are querying.
attribute - The X Atom of the attribute to be retrieved.
value - The returned attribute value.
value - The returned attribute value.
Errors:

10719
lib/libXvMC/aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Has shm*() functions */
#undef HAS_SHM
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@ -12,6 +9,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `shmat' function. */
#undef HAVE_SHMAT
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@ -33,6 +33,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE

29536
lib/libXvMC/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,59 +1,60 @@
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
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libXvMC], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXvMC])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_INIT([libXvMC],
[1.0.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXvMC])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
# Initialize libtool
AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
# Require X.Org macros 1.8 or later for AC_PROG_INSTALL
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
dnl Allow checking code with lint, sparse, etc.
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
# Checks for library functions.
AC_CHECK_FUNCS([shmat])
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
LINT_FLAGS="${LINT_FLAGS} ${XVMC_CFLAGS}"
AC_OUTPUT([Makefile
include/Makefile
include/X11/Makefile
include/X11/extensions/Makefile
src/Makefile
xvmc.pc])
AC_CONFIG_FILES([Makefile
include/Makefile
include/X11/Makefile
include/X11/extensions/Makefile
src/Makefile
wrapper/Makefile
xvmc.pc])
AC_OUTPUT

View File

@ -22,9 +22,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -70,6 +70,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -77,24 +78,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -103,6 +100,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -113,6 +111,7 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -120,11 +119,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -137,6 +141,7 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -144,13 +149,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XVMC_CFLAGS = @XVMC_CFLAGS@
XVMC_LIBS = @XVMC_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@

View File

@ -22,9 +22,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -70,6 +70,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -77,24 +78,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -103,6 +100,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -113,6 +111,7 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -120,11 +119,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -137,6 +141,7 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -144,13 +149,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XVMC_CFLAGS = @XVMC_CFLAGS@
XVMC_LIBS = @XVMC_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@

View File

@ -23,9 +23,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -74,6 +74,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -81,24 +82,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -107,6 +104,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -117,6 +115,7 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -124,11 +123,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -141,6 +145,7 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -148,13 +153,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XVMC_CFLAGS = @XVMC_CFLAGS@
XVMC_LIBS = @XVMC_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@

View File

@ -11,8 +11,8 @@ Bool XvMCQueryExtension (Display *display, int *eventBase, int *errBase);
Status XvMCQueryVersion (Display *display, int *major_versionp,
int *minor_versionp);
Status XvMCGetDRInfo(Display *dpy, XvPortID port,
char **name, char **busID,
int *major, int *minor,
char **name, char **busID,
int *major, int *minor,
int *patchLevel,
int *isLocal);
@ -31,7 +31,7 @@ Status XvMCCreateContext (
Status XvMCDestroyContext (Display *display, XvMCContext * context);
Status
Status
XvMCCreateSurface(
Display *display,
XvMCContext * context,
@ -52,9 +52,9 @@ XvMCPutSurface(
Display *display,
XvMCSurface *surface,
Drawable draw,
short srcx,
short srcy,
unsigned short srcw,
short srcx,
short srcy,
unsigned short srcw,
unsigned short srch,
short destx,
short desty,
@ -67,9 +67,9 @@ Status XvMCHideSurface(Display *display, XvMCSurface *surface);
Status
XvMCCreateSubpicture (
Display *display,
Display *display,
XvMCContext *context,
XvMCSubpicture *subpicture,
XvMCSubpicture *subpicture,
unsigned short width,
unsigned short height,
int xvimage_id
@ -105,8 +105,8 @@ XvMCDestroySubpicture (Display *display, XvMCSubpicture *subpicture);
Status
XvMCSetSubpicturePalette (
Display *display,
XvMCSubpicture *subpicture,
Display *display,
XvMCSubpicture *subpicture,
unsigned char *palette
);
@ -145,7 +145,7 @@ Status XvMCSyncSurface (Display *display, XvMCSurface *surface);
Status XvMCFlushSurface (Display *display, XvMCSurface *surface);
Status XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat);
Status XvMCRenderSurface (
Status XvMCRenderSurface (
Display *display,
XvMCContext *context,
unsigned int picture_structure,
@ -166,7 +166,7 @@ Status
XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat);
Status XvMCCreateBlocks (
Display *display,
Display *display,
XvMCContext *context,
unsigned int num_blocks,
XvMCBlockArray *block
@ -196,16 +196,16 @@ XvMCQueryAttributes (
Status
XvMCSetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
XvMCContext *context,
Atom attribute,
int value
);
Status
XvMCGetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
XvMCContext *context,
Atom attribute,
int *value
);

File diff suppressed because it is too large Load Diff

View File

@ -1,34 +1,16 @@
lib_LTLIBRARIES = libXvMC.la libXvMCW.la
lib_LTLIBRARIES = libXvMC.la
libXvMC_la_SOURCES = \
XvMC.c \
XvMClibint.h
libXvMCW_la_SOURCES = \
XvMCWrapper.c
AM_CFLAGS = $(CWARNFLAGS) @XVMC_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
libXvMC_la_LIBADD = @XVMC_LIBS@
libXvMC_la_CFLAGS = $(AM_CFLAGS)
libXvMCW_la_LIBADD = @XVMC_LIBS@
libXvMCW_la_CFLAGS = \
$(AM_CFLAGS) \
-DXVMC_CONFIGDIR=$(sysconfdir)/X11 \
-DXVMC_SOVERSION=\".1.0\" \
-DXV_SOVERSION=\".1.0\"
AM_CPPFLAGS = -I$(top_srcdir)/include $(MALLOC_ZERO_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMC_la_SOURCES = XvMC.c XvMClibint.h
libXvMC_la_LIBADD = $(XVMC_LIBS)
libXvMC_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS)
lint:
$(LINT) $(ALL_LINT_FLAGS) $(libXvMC_la_SOURCES) $(XVMC_LIBS)
$(LINT) $(ALL_LINT_FLAGS) $(libXvMCW_la_CFLAGS) $(libXvMCW_la_SOURCES) $(XVMC_LIBS)
$(LINT) $(ALL_LINT_FLAGS) $(libXvMC_la_SOURCES) $(AM_CFLAGS) $(XVMC_LIBS)
endif LINT

View File

@ -23,9 +23,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -54,12 +54,10 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libXvMC_la_DEPENDENCIES =
am_libXvMC_la_OBJECTS = libXvMC_la-XvMC.lo
am__DEPENDENCIES_1 =
libXvMC_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libXvMC_la_OBJECTS = XvMC.lo
libXvMC_la_OBJECTS = $(am_libXvMC_la_OBJECTS)
libXvMCW_la_DEPENDENCIES =
am_libXvMCW_la_OBJECTS = libXvMCW_la-XvMCWrapper.lo
libXvMCW_la_OBJECTS = $(am_libXvMCW_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -71,8 +69,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libXvMC_la_SOURCES) $(libXvMCW_la_SOURCES)
DIST_SOURCES = $(libXvMC_la_SOURCES) $(libXvMCW_la_SOURCES)
SOURCES = $(libXvMC_la_SOURCES)
DIST_SOURCES = $(libXvMC_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -90,6 +88,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -97,24 +96,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -123,6 +118,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@ -133,6 +129,7 @@ LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -140,11 +137,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -157,6 +159,7 @@ RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -164,13 +167,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XVMC_CFLAGS = @XVMC_CFLAGS@
XVMC_LIBS = @XVMC_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -211,28 +212,13 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LTLIBRARIES = libXvMC.la libXvMCW.la
libXvMC_la_SOURCES = \
XvMC.c \
XvMClibint.h
libXvMCW_la_SOURCES = \
XvMCWrapper.c
AM_CFLAGS = $(CWARNFLAGS) @XVMC_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
libXvMC_la_LIBADD = @XVMC_LIBS@
libXvMC_la_CFLAGS = $(AM_CFLAGS)
libXvMCW_la_LIBADD = @XVMC_LIBS@
libXvMCW_la_CFLAGS = \
$(AM_CFLAGS) \
-DXVMC_CONFIGDIR=$(sysconfdir)/X11 \
-DXVMC_SOVERSION=\".1.0\" \
-DXV_SOVERSION=\".1.0\"
lib_LTLIBRARIES = libXvMC.la
AM_CPPFLAGS = -I$(top_srcdir)/include $(MALLOC_ZERO_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMC_la_SOURCES = XvMC.c XvMClibint.h
libXvMC_la_LIBADD = $(XVMC_LIBS)
libXvMC_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
all: all-am
@ -297,8 +283,6 @@ clean-libLTLIBRARIES:
done
libXvMC.la: $(libXvMC_la_OBJECTS) $(libXvMC_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libXvMC_la_LDFLAGS) $(libXvMC_la_OBJECTS) $(libXvMC_la_LIBADD) $(LIBS)
libXvMCW.la: $(libXvMCW_la_OBJECTS) $(libXvMCW_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libXvMCW_la_LDFLAGS) $(libXvMCW_la_OBJECTS) $(libXvMCW_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@ -306,8 +290,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libXvMCW_la-XvMCWrapper.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libXvMC_la-XvMC.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XvMC.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -330,20 +313,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libXvMC_la-XvMC.lo: XvMC.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libXvMC_la_CFLAGS) $(CFLAGS) -MT libXvMC_la-XvMC.lo -MD -MP -MF "$(DEPDIR)/libXvMC_la-XvMC.Tpo" -c -o libXvMC_la-XvMC.lo `test -f 'XvMC.c' || echo '$(srcdir)/'`XvMC.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libXvMC_la-XvMC.Tpo" "$(DEPDIR)/libXvMC_la-XvMC.Plo"; else rm -f "$(DEPDIR)/libXvMC_la-XvMC.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='XvMC.c' object='libXvMC_la-XvMC.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libXvMC_la_CFLAGS) $(CFLAGS) -c -o libXvMC_la-XvMC.lo `test -f 'XvMC.c' || echo '$(srcdir)/'`XvMC.c
libXvMCW_la-XvMCWrapper.lo: XvMCWrapper.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libXvMCW_la_CFLAGS) $(CFLAGS) -MT libXvMCW_la-XvMCWrapper.lo -MD -MP -MF "$(DEPDIR)/libXvMCW_la-XvMCWrapper.Tpo" -c -o libXvMCW_la-XvMCWrapper.lo `test -f 'XvMCWrapper.c' || echo '$(srcdir)/'`XvMCWrapper.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libXvMCW_la-XvMCWrapper.Tpo" "$(DEPDIR)/libXvMCW_la-XvMCWrapper.Plo"; else rm -f "$(DEPDIR)/libXvMCW_la-XvMCWrapper.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='XvMCWrapper.c' object='libXvMCW_la-XvMCWrapper.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libXvMCW_la_CFLAGS) $(CFLAGS) -c -o libXvMCW_la-XvMCWrapper.lo `test -f 'XvMCWrapper.c' || echo '$(srcdir)/'`XvMCWrapper.c
mostlyclean-libtool:
-rm -f *.lo
@ -526,8 +495,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
@LINT_TRUE@lint:
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXvMC_la_SOURCES) $(XVMC_LIBS)
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXvMCW_la_CFLAGS) $(libXvMCW_la_SOURCES) $(XVMC_LIBS)
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXvMC_la_SOURCES) $(AM_CFLAGS) $(XVMC_LIBS)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -3,7 +3,7 @@
#endif
#include <stdio.h>
#include "XvMClibint.h"
#ifdef HAS_SHM
#ifdef HAVE_SHMAT
#ifndef Lynx
#include <sys/ipc.h>
#include <sys/shm.h>
@ -11,7 +11,7 @@
#include <ipc.h>
#include <shm.h>
#endif /* Lynx */
#endif /* HAS_SHM */
#endif /* HAVE_SHMAT */
#include <unistd.h>
#include <sys/time.h>
#include <X11/extensions/Xext.h>
@ -19,9 +19,9 @@
static XExtensionInfo _xvmc_info_data;
static XExtensionInfo *xvmc_info = &_xvmc_info_data;
static char *xvmc_extension_name = XvMCName;
static const char *xvmc_extension_name = XvMCName;
static char *xvmc_error_list[] =
static const char *xvmc_error_list[] =
{
"BadContext",
"BadSurface",
@ -100,7 +100,7 @@ XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num)
*num = 0;
XvMCCheckExtension (dpy, info, NULL);
LockDisplay (dpy);
XvMCGetReq (ListSurfaceTypes, req);
req->port = port;
@ -111,7 +111,7 @@ XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num)
}
if(rep.num > 0) {
surface_info =
surface_info =
(XvMCSurfaceInfo*)Xmalloc(rep.num * sizeof(XvMCSurfaceInfo));
if(surface_info) {
@ -126,9 +126,9 @@ XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num)
surface_info[i].chroma_format = sinfo.chroma_format;
surface_info[i].max_width = sinfo.max_width;
surface_info[i].max_height = sinfo.max_height;
surface_info[i].subpicture_max_width =
surface_info[i].subpicture_max_width =
sinfo.subpicture_max_width;
surface_info[i].subpicture_max_height =
surface_info[i].subpicture_max_height =
sinfo.subpicture_max_height;
surface_info[i].mc_type = sinfo.mc_type;
surface_info[i].flags = sinfo.flags;
@ -172,7 +172,7 @@ XvImageFormatValues * XvMCListSubpictureTypes (
}
if(rep.num > 0) {
ret =
ret =
(XvImageFormatValues*)Xmalloc(rep.num * sizeof(XvImageFormatValues));
if(ret) {
@ -183,19 +183,19 @@ XvImageFormatValues * XvMCListSubpictureTypes (
for(i = 0; i < rep.num; 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;
@ -212,18 +212,18 @@ XvImageFormatValues * XvMCListSubpictureTypes (
UnlockDisplay (dpy);
SyncHandle ();
return ret;
return ret;
}
/******************************************************************
/******************************************************************
These are intended as a protocol interface to be used by direct
rendering libraries. They are not intended to be client viewable
functions. These will stay in place until we have a mechanism in
place similar to that of OpenGL with an libXvMCcore library.
*******************************************************************/
/*
*******************************************************************/
/*
_xvmc_create_context -
Pass in the context with the surface_type_id, width, height,
@ -234,7 +234,7 @@ XvImageFormatValues * XvMCListSubpictureTypes (
an array of priv_count CARD32s. This data is allocated by
this function. If returned, the caller is responsible for
freeing it! Generally, such information is only returned if
an XVMC_DIRECT context was specified.
an XVMC_DIRECT context was specified.
*/
@ -309,14 +309,14 @@ Status _xvmc_destroy_context (
_xvmc_create_surface -
Pass the context and this function will fill out all the
information in the surface.
information in the surface.
The server may return implementation-specific information
back in the priv_data. The size of that information will
an array of priv_count CARD32s. This data is allocated by
this function. If returned, the caller is responsible for
freeing it! Generally, such information is returned only if
the context was a direct context.
*/
Status _xvmc_create_surface (
@ -469,15 +469,15 @@ Status _xvmc_destroy_subpicture(
LockDisplay (dpy);
XvMCGetReq (DestroySubpicture, req);
req->subpicture_id = subpicture->subpicture_id;
req->subpicture_id = subpicture->subpicture_id;
UnlockDisplay (dpy);
SyncHandle ();
return Success;
}
Status XvMCGetDRInfo(Display *dpy, XvPortID port,
char **name, char **busID,
int *major, int *minor,
char **name, char **busID,
int *major, int *minor,
int *patchLevel,
int *isLocal)
{
@ -487,7 +487,7 @@ Status XvMCGetDRInfo(Display *dpy, XvPortID port,
char *tmpBuf = NULL;
CARD32 magic;
#ifdef HAS_SHM
#ifdef HAVE_SHMAT
volatile CARD32 *shMem;
struct timezone here;
struct timeval now;
@ -503,7 +503,7 @@ Status XvMCGetDRInfo(Display *dpy, XvPortID port,
req->port = port;
magic = 0;
req->magic = 0;
#ifdef HAS_SHM
#ifdef HAVE_SHMAT
req->shmKey = shmget(IPC_PRIVATE, 1024, IPC_CREAT | 0600);
/*
@ -514,11 +514,11 @@ Status XvMCGetDRInfo(Display *dpy, XvPortID port,
* any complicated data on those pages. Thats the explanation of this
* otherwise stupid-looking pattern algorithm.
*/
if (req->shmKey >= 0) {
shMem = (CARD32 *) shmat(req->shmKey, NULL, 0);
shmctl( req->shmKey, IPC_RMID, NULL);
if ( shMem ) {
if ( shMem ) {
register volatile CARD32 *shMemC = shMem;
register int i;
@ -528,7 +528,7 @@ Status XvMCGetDRInfo(Display *dpy, XvPortID port,
req->magic = magic;
i = 1024 / sizeof(CARD32);
while(i--) {
*shMemC++ = magic;
*shMemC++ = magic;
magic = ~magic;
}
} else {
@ -541,14 +541,14 @@ Status XvMCGetDRInfo(Display *dpy, XvPortID port,
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay (dpy);
SyncHandle ();
#ifdef HAS_SHM
#ifdef HAVE_SHMAT
if ( req->shmKey >= 0) {
shmdt( (const void *) shMem );
}
}
#endif
return -1;
}
#ifdef HAS_SHM
#ifdef HAVE_SHMAT
shmdt( (const void *) shMem );
#endif
@ -567,7 +567,7 @@ Status XvMCGetDRInfo(Display *dpy, XvPortID port,
}
} else {
XFree(tmpBuf);
}
}
}
if (*name && *busID && tmpBuf) {

View File

@ -0,0 +1,22 @@
lib_LTLIBRARIES = libXvMCW.la
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
$(MALLOC_ZERO_CFLAGS) \
-DXVMC_CONFIGDIR=$(sysconfdir)/X11 \
-DXVMC_SOVERSION=\".1.0\" \
-DXV_SOVERSION=\".1.0\"
AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMCW_la_SOURCES = XvMCWrapper.c
libXvMCW_la_LIBADD = $(XVMC_LIBS)
libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS)
lint:
$(LINT) $(ALL_LINT_FLAGS) $(libXvMCW_la_SOURCES) $(AM_CFLAGS) $(XVMC_LIBS)
endif LINT

View File

@ -0,0 +1,507 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = wrapper
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libXvMCW_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libXvMCW_la_OBJECTS = XvMCWrapper.lo
libXvMCW_la_OBJECTS = $(am_libXvMCW_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libXvMCW_la_SOURCES)
DIST_SOURCES = $(libXvMCW_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XVMC_CFLAGS = @XVMC_CFLAGS@
XVMC_LIBS = @XVMC_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LTLIBRARIES = libXvMCW.la
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
$(MALLOC_ZERO_CFLAGS) \
-DXVMC_CONFIGDIR=$(sysconfdir)/X11 \
-DXVMC_SOVERSION=\".1.0\" \
-DXV_SOVERSION=\".1.0\"
AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMCW_la_SOURCES = XvMCWrapper.c
libXvMCW_la_LIBADD = $(XVMC_LIBS)
libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign wrapper/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign wrapper/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
$(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libXvMCW.la: $(libXvMCW_la_OBJECTS) $(libXvMCW_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libXvMCW_la_LDFLAGS) $(libXvMCW_la_OBJECTS) $(libXvMCW_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XvMCWrapper.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
-rm -f libtool
uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
dvi: dvi-am
dvi-am:
html: html-am
info: info-am
info-am:
install-data-am:
install-exec-am: install-libLTLIBRARIES
install-info: install-info-am
install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
install-libLTLIBRARIES install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
uninstall-libLTLIBRARIES
@LINT_TRUE@lint:
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXvMCW_la_SOURCES) $(AM_CFLAGS) $(XVMC_LIBS)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -26,7 +26,7 @@
*/
/*
* BUGS: The wrapper really should maintain one symbol table per port. This
* BUGS: The wrapper really should maintain one symbol table per port. This
* could possibly be impemented, To do that, the port-independent symbols need to be lifted out,
* and one would have to create a number of mapping tables:
*
@ -35,7 +35,7 @@
* surface -> port
* subpicture -> port
*
* and reference the right table when needed.
* and reference the right table when needed.
* This needs to be done only if there is a player that wants to access two displays with different
* hardware simultaneously. Not likely as of today.
*/
@ -63,10 +63,10 @@ typedef Status (*XvMCDestroyContextP) (Display *, XvMCContext * );
typedef Status (*XvMCCreateSurfaceP)(Display *,XvMCContext *,XvMCSurface *);
typedef Status (*XvMCDestroySurfaceP)(Display *, XvMCSurface *);
typedef XvImageFormatValues * (*XvMCListSubpictureTypesP) (Display *,XvPortID ,int ,int *);
typedef Status (*XvMCPutSurfaceP)(Display *,XvMCSurface *,Drawable ,short , short , unsigned short ,
typedef Status (*XvMCPutSurfaceP)(Display *,XvMCSurface *,Drawable ,short , short , unsigned short ,
unsigned short ,short ,short ,unsigned short ,unsigned short ,int );
typedef Status (*XvMCHideSurfaceP)(Display *, XvMCSurface *);
typedef Status (*XvMCCreateSubpictureP) (Display *, XvMCContext *, XvMCSubpicture *,
typedef Status (*XvMCCreateSubpictureP) (Display *, XvMCContext *, XvMCSubpicture *,
unsigned short, unsigned short,int);
typedef Status (*XvMCClearSubpictureP) (Display *,XvMCSubpicture *,short,short,unsigned short,unsigned short,
unsigned int);
@ -101,56 +101,56 @@ typedef Status (*XvMCGetAttributeP) (Display *,XvMCContext *, Atom, int *);
/*
* Nonstandard VLD acceleration level:
*/
*/
typedef Status (*XvMCBeginSurfaceP) (Display *,XvMCContext *,XvMCSurface *,
XvMCSurface *,XvMCSurface *f,const XvMCMpegControl *);
typedef Status (*XvMCLoadQMatrixP) (Display *, XvMCContext *,const XvMCQMatrix *);
typedef Status (*XvMCPutSliceP)(Display *,XvMCContext *, char *,int);
typedef Status (*XvMCPutSlice2P)(Display *,XvMCContext *, char *,int, unsigned);
typedef Status (*XvMCGetDRInfoP)(Display *, XvPortID, char **, char **, int *, int *,
typedef Status (*XvMCGetDRInfoP)(Display *, XvPortID, char **, char **, int *, int *,
int *, int *);
typedef struct {
XvMCQueryExtensionP XvMCQueryExtension;
XvMCQueryVersionP XvMCQueryVersion;
XvMCQueryExtensionP XvMCQueryExtension;
XvMCQueryVersionP XvMCQueryVersion;
XvMCListSurfaceTypesP XvMCListSurfaceTypes;
XvMCCreateContextP XvMCCreateContext;
XvMCDestroyContextP XvMCDestroyContext;
XvMCCreateContextP XvMCCreateContext;
XvMCDestroyContextP XvMCDestroyContext;
XvMCCreateSurfaceP XvMCCreateSurface;
XvMCDestroySurfaceP XvMCDestroySurface;
XvMCListSubpictureTypesP XvMCListSubpictureTypes;
XvMCListSubpictureTypesP XvMCListSubpictureTypes;
XvMCPutSurfaceP XvMCPutSurface;
XvMCHideSurfaceP XvMCHideSurface;
XvMCCreateSubpictureP XvMCCreateSubpicture;
XvMCClearSubpictureP XvMCClearSubpicture;
XvMCCompositeSubpictureP XvMCCompositeSubpicture;
XvMCDestroySubpictureP XvMCDestroySubpicture;
XvMCSetSubpicturePaletteP XvMCSetSubpicturePalette;
XvMCBlendSubpictureP XvMCBlendSubpicture;
XvMCClearSubpictureP XvMCClearSubpicture;
XvMCCompositeSubpictureP XvMCCompositeSubpicture;
XvMCDestroySubpictureP XvMCDestroySubpicture;
XvMCSetSubpicturePaletteP XvMCSetSubpicturePalette;
XvMCBlendSubpictureP XvMCBlendSubpicture;
XvMCBlendSubpicture2P XvMCBlendSubpicture2;
XvMCSyncSurfaceP XvMCSyncSurface;
XvMCFlushSurfaceP XvMCFlushSurface;
XvMCGetSurfaceStatusP XvMCGetSurfaceStatus;
XvMCRenderSurfaceP XvMCRenderSurface;
XvMCSyncSubpictureP XvMCSyncSubpicture;
XvMCFlushSubpictureP XvMCFlushSubpicture;
XvMCGetSubpictureStatusP XvMCGetSubpictureStatus;
XvMCCreateBlocksP XvMCCreateBlocks;
XvMCDestroyBlocksP XvMCDestroyBlocks;
XvMCSyncSurfaceP XvMCSyncSurface;
XvMCFlushSurfaceP XvMCFlushSurface;
XvMCGetSurfaceStatusP XvMCGetSurfaceStatus;
XvMCRenderSurfaceP XvMCRenderSurface;
XvMCSyncSubpictureP XvMCSyncSubpicture;
XvMCFlushSubpictureP XvMCFlushSubpicture;
XvMCGetSubpictureStatusP XvMCGetSubpictureStatus;
XvMCCreateBlocksP XvMCCreateBlocks;
XvMCDestroyBlocksP XvMCDestroyBlocks;
XvMCCreateMacroBlocksP XvMCCreateMacroBlocks;
XvMCDestroyMacroBlocksP XvMCDestroyMacroBlocks;
XvMCQueryAttributesP XvMCQueryAttributes;
XvMCSetAttributeP XvMCSetAttribute;
XvMCGetAttributeP XvMCGetAttribute;
XvMCDestroyMacroBlocksP XvMCDestroyMacroBlocks;
XvMCQueryAttributesP XvMCQueryAttributes;
XvMCSetAttributeP XvMCSetAttribute;
XvMCGetAttributeP XvMCGetAttribute;
/*
* Nonstandard VLD acceleration level:
*/
XvMCBeginSurfaceP XvMCBeginSurface;
XvMCLoadQMatrixP XvMCLoadQMatrix;
*/
XvMCBeginSurfaceP XvMCBeginSurface;
XvMCLoadQMatrixP XvMCLoadQMatrix;
XvMCPutSliceP XvMCPutSlice;
XvMCPutSlice2P XvMCPutSlice2;
@ -196,7 +196,7 @@ static void *handle2;
if (dlerror() != NULL) { \
base.pointer = (pointer##P) dlsym((handle2),#pointer); \
if (dlerror() != NULL) return; \
}
}
/*
@ -204,14 +204,14 @@ static void *handle2;
*/
static void *dlopenversion(const char *lib, const char *version, int flag)
static void *dlopenversion(const char *lib, const char *version, int flag)
{
void *ret;
int curLen,verLen;
char *curName;
const char *tail;
curLen = strlen(lib) + (verLen = strlen(version)) + 1;
curName = (char *) malloc(curLen * sizeof(char));
strncpy( curName, lib, curLen);
@ -227,7 +227,7 @@ static void *dlopenversion(const char *lib, const char *version, int flag)
return ret;
}
static int preInitW(Display *dpy)
static int preInitW(Display *dpy)
{
/*
@ -244,7 +244,7 @@ static int preInitW(Display *dpy)
fprintf(stderr,"XvMCWrapper: Warning! Could not open shared "
"library \"libXv.so" XV_SOVERSION "\"\nThis may cause relocation "
"errors later.\nError was: \"%s\".\n",dlerror());
}
}
handle2 = dlopenversion("libXvMC.so", XVMC_SOVERSION, RTLD_LAZY | RTLD_GLOBAL);
if (!handle2) {
fprintf(stderr,"XvMCWrapper: Could not load XvMC "
@ -258,14 +258,14 @@ static int preInitW(Display *dpy)
return 0;
}
static void initW(Display *dpy, XvPortID port)
static void initW(Display *dpy, XvPortID port)
{
char nameBuffer[BUFLEN];
void *handle;
int tmp;
char *clientName = NULL;
char *err;
FILE *configFile;
FILE *configFile;
int nameLen = 0;
int major,minor,patchLevel,isLocal;
char *busID = NULL;
@ -273,18 +273,18 @@ static void initW(Display *dpy, XvPortID port)
wrapperInit = 1;
xW.initialised = 0;
if (!wrapperPreInit)
if (!wrapperPreInit)
if (preInitW( dpy )) return;
/*
* Will the DDX tell us the client driver name?
*/
*/
xW.XvMCGetDRInfo = (XvMCGetDRInfoP)
dlsym(handle2,"XvMCGetDRInfo");
if ((err = dlerror()) == NULL) {
if (0 == xW.XvMCGetDRInfo( dpy, port, &clientName, &busID, &major,
if (0 == xW.XvMCGetDRInfo( dpy, port, &clientName, &busID, &major,
&minor,&patchLevel, &isLocal)) {
nameLen = strlen(clientName);
XFree(busID);
@ -296,7 +296,7 @@ static void initW(Display *dpy, XvPortID port)
} else {
clientName = NULL;
}
}
}
if (clientName && (nameLen < BUFLEN-7) && (nameLen > 0)) {
nameLen += 3;
@ -310,11 +310,11 @@ static void initW(Display *dpy, XvPortID port)
/*
* No. Try to obtain it from the config file.
*/
if (clientName) XFree(clientName);
configFile = fopen(STRS(XVMC_CONFIGDIR) "/XvMCConfig","r");
xW.initialised = 0;
xW.vldextension = 0;
@ -331,7 +331,7 @@ static void initW(Display *dpy, XvPortID port)
perror("XvMCWrapper");
return;
}
fclose(configFile);
if ((tmp = strlen(nameBuffer)) == 0) {
fprintf(stderr,"XvMCWrapper: Zero length XvMC library name.\n");
@ -342,7 +342,7 @@ static void initW(Display *dpy, XvPortID port)
/*
* Skip trailing newlines and garbage.
*/
while (iscntrl(nameBuffer[tmp-1])) {
nameBuffer[tmp-1] = 0;
if (--tmp == 0) {
@ -413,7 +413,7 @@ Status XvMCQueryVersion (Display *display, int *major_versionp,
}
XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num)
XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num)
{
if (!wrapperInit) initW( dpy, port);
if (!xW.initialised) return NULL;
@ -442,7 +442,7 @@ Status XvMCDestroyContext (Display *display, XvMCContext * context)
return (*xW.XvMCDestroyContext)(display, context);
}
Status
Status
XvMCCreateSurface(
Display *display,
XvMCContext * context,
@ -478,9 +478,9 @@ XvMCPutSurface(
Display *display,
XvMCSurface *surface,
Drawable draw,
short srcx,
short srcy,
unsigned short srcw,
short srcx,
short srcy,
unsigned short srcw,
unsigned short srch,
short destx,
short desty,
@ -503,9 +503,9 @@ Status XvMCHideSurface(Display *display, XvMCSurface *surface)
Status
XvMCCreateSubpicture (
Display *display,
Display *display,
XvMCContext *context,
XvMCSubpicture *subpicture,
XvMCSubpicture *subpicture,
unsigned short width,
unsigned short height,
int xvimage_id
@ -560,8 +560,8 @@ XvMCDestroySubpicture (Display *display, XvMCSubpicture *subpicture)
Status
XvMCSetSubpicturePalette (
Display *display,
XvMCSubpicture *subpicture,
Display *display,
XvMCSubpicture *subpicture,
unsigned char *palette
)
{
@ -631,7 +631,7 @@ Status XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat)
return (*xW.XvMCGetSurfaceStatus)(display, surface, stat);
}
Status XvMCRenderSurface (
Status XvMCRenderSurface (
Display *display,
XvMCContext *context,
unsigned int picture_structure,
@ -670,7 +670,7 @@ XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat)
}
Status XvMCCreateBlocks (
Display *display,
Display *display,
XvMCContext *context,
unsigned int num_blocks,
XvMCBlockArray *block
@ -719,13 +719,13 @@ XvMCQueryAttributes (
if (!xW.initialised) return NULL;
return (*xW.XvMCQueryAttributes)(display, context, number);
}
Status
XvMCSetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
XvMCContext *context,
Atom attribute,
int value
)
{
@ -737,8 +737,8 @@ XvMCSetAttribute (
Status
XvMCGetAttribute (
Display *display,
XvMCContext *context,
Atom attribute,
XvMCContext *context,
Atom attribute,
int *value
)
{
@ -755,7 +755,7 @@ Status XvMCBeginSurface(Display *display,
const XvMCMpegControl *control)
{
if (!xW.vldextension) return BadValue;
return (*xW.XvMCBeginSurface)(display, context, target_surface, past_surface, future_surface,
return (*xW.XvMCBeginSurface)(display, context, target_surface, past_surface, future_surface,
control);
}