head	1.1;
access;
symbols
	trunk-20040613:1.1
	mach64-last-merge:1.1
	driinterface-0-0-3-20040303-merge:1.1
	driinterface-0-0-3-20040303-premerge:1.1
	driinterface-0-0-3-20040303:1.1
	driinterface-0-0-3-branch:1.1.0.38
	mach64-0-0-7-branch:1.1.0.36
	driinterface-0-0-2-branch:1.1.0.34
	newmesa-0-0-1-20031209-merge:1.1
	trunk-20031209:1.1
	newmesa-0-0-1-20031209:1.1
	newmesa-0-0-1-branch:1.1.0.32
	driinterface-0-0-1-branch:1.1.0.30
	savage-2-0-0-branch:1.1.0.28
	savage-2-0-0-fork:1.1
	config-0-0-1-20031005-freeze:1.1
	savage-1_0_0-20031002-trunk-premerge:1.1
	cle266-0-0-1-branch:1.1.0.26
	i865-agp-0-1-20030929:1.1
	trunk-20030916:1.1
	XFree86-4_3_99_12-merge:1.1
	trunk-20030912:1.1
	i865-agp-0-1-20030905:1.1
	i865-agp-0-1-20030728:1.1
	i865-agp-0-1-20030707:1.1
	savage-1_0_0-branch:1.1.0.24
	newdrm-0-0-1-branch:1.1.0.22
	i865-agp-0-1-branch:1.1.0.20
	config-0-0-1-branch:1.1.0.18
	texmem-0-0-1-20030429-merge:1.1
	texmem-0-0-1-20030429-premerge:1.1
	texmem-0-0-1-20030407:1.1.4.1
	trident-0-0-2-branch:1.1.0.16
	mach64-0-0-6-20030330:1.1
	mach64-0-0-6-20030329-freeze:1.1
	texmem-0-0-1-20030328-freeze:1.1.4.1
	X_4_3_0-20030324-merge:1.1.1.1
	XFree:1.1.1
	X_4_3_0-20020324-preimport:1.1
	drm-filp-0-1-branch:1.1.0.14
	mesa-4-0-4-20030222:1.1
	bsd-4-0-0-20030221-merge:1.1
	bsd-4-0-0-20030220:1.1
	bsd-4-0-0-20030220-freeze:1.1
	mesa-4-0-4-20030216:1.1
	mach64-0-0-6-branch:1.1.0.12
	mesa-4-0-4-20030208:1.1
	texmem-0-0-1-20030204-trunk-merge:1.1.4.1
	texmem-0-0-1-20030204-trunk-premerge:1.1.4.1
	mesa-4-0-4-20030203:1.1
	mesa-4-0-4-20030129:1.1
	texmem-0-0-1-20030125-trunk-merge:1.1.4.1
	texmem-0-0-1-20030123-trunk-premerge:1.1.4.1
	mesa-4-0-4-20030114:1.1
	agpgart_2_0_branch:1.1.0.10
	mesa-4-0-4-20021220:1.1
	mesa-4-0-4-20021216:1.1
	mesa-4-0-4-20021215:1.1
	mesa-4-0-4-20021214:1.1
	mesa-4-0-4-branch:1.1.0.8
	texmem-0-0-1-20021127-mesa-4-1-merge:1.1.4.1
	trunk-20021125:1.1
	mesa-4-1-branch:1.1.0.6
	texmem-0-0-1:1.1.0.4
	bsd-4-0-0-branch:1.1.0.2;
locks; strict;
comment	@// @;


1.1
date	2002.10.30.10.08.51;	author alanh;	state Exp;
branches
	1.1.1.1
	1.1.4.1
	1.1.6.1;
next	;

1.1.1.1
date	2003.03.25.00.09.31;	author alanh;	state Exp;
branches;
next	;

1.1.4.1
date	2002.11.11.23.32.02;	author idr;	state Exp;
branches;
next	;

1.1.6.1
date	2002.11.15.01.58.23;	author brianp;	state Exp;
branches;
next	;


desc
@@


1.1
log
@re-import the XvMC libraries from 4.2.0
build the XvMC library by default as it uses the DRM (for build testing)
Fix up XvMC to use the drmCommand interface
@
text
@LIBRARY Xv
VERSION LIBRARY_VERSION
EXPORTS
XvCreateImage
XvFreeAdaptorInfo
XvFreeEncodingInfo
XvGetPortAttribute
XvGetStill
XvGetVideo
XvGrabPort
XvListImageFormats
XvPutImage
XvPutStill
XvPutVideo
XvQueryAdaptors
XvQueryBestSize
XvQueryEncodings
XvQueryExtension
XvQueryPortAttributes
XvSelectPortNotify
XvSelectVideoNotify
XvSetPortAttribute
XvShmCreateImage
XvShmPutImage
XvStopVideo
XvUngrabPort
/* $XFree86: xc/lib/Xv/Xv-def.cpp,v 1.1 2002/09/30 22:02:17 alanh Exp $ */
@


1.1.1.1
log
@XFree86 4.3.0 merge
@
text
@@


1.1.6.1
log
@merge from trunk
@
text
@@


1.1.4.1
log
@Massive merge from trunk.
@
text
@@