Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGE

23 files changed, 24 insertions, 23 deletions

diff --git a/include/X11/extensions/Xvlib.h b/include/X11/extensions/Xvlib.h
index faaf03b..2fd26e5 100644
--- a/include/X11/extensions/Xvlib.h
+++ b/include/X11/extensions/Xvlib.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xvlib.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xvlib.h,v 1.3 1999/12/11 19:28:48 mvojkovi Exp $ */
 
 #ifndef XVLIB_H
 #define XVLIB_H
diff --git a/man/Xv.man b/man/Xv.man
index eaf5861..e9eec9d 100644
--- a/man/Xv.man
+++ b/man/Xv.man
@@ -1,6 +1,6 @@
 .TH Xv 3X __vendorversion__
 .\"
-.\" $XFree86: xc/doc/man/Xv/Xv.man,v 1.6 2001/01/27 18:20:35 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/Xv.man,v 1.5 2000/03/21 23:17:19 dawes Exp $
 .SH Name
 Xv \- X Window System video extension
 .SH Description
diff --git a/man/XvFreeAdaptorInfo.man b/man/XvFreeAdaptorInfo.man
index 8a557c5..7290187 100644
--- a/man/XvFreeAdaptorInfo.man
+++ b/man/XvFreeAdaptorInfo.man
@@ -1,5 +1,5 @@
 .TH XvFreeAdaptorInfo 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvFreeAdaptorInfo.man,v 1.5 2001/01/27 18:20:35 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvFreeAdaptorInfo.man,v 1.4 1999/03/02 11:49:13 dawes Exp $
 .SH Name
 XvFreeAdaptorInfo \- free adaptor information 
 .\"
diff --git a/man/XvFreeEncodingInfo.man b/man/XvFreeEncodingInfo.man
index d7f609c..385360b 100644
--- a/man/XvFreeEncodingInfo.man
+++ b/man/XvFreeEncodingInfo.man
@@ -1,5 +1,5 @@
 .TH XvFreeEncodingInfo 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvFreeEncodingInfo.man,v 1.5 2001/01/27 18:20:35 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvFreeEncodingInfo.man,v 1.4 1999/03/02 11:49:13 dawes Exp $
 .SH Name
 XvFreeEncodingInfo \- free encoding information 
 .\"
diff --git a/man/XvGetPortAttribute.man b/man/XvGetPortAttribute.man
index ceb0ca1..286f3b9 100644
--- a/man/XvGetPortAttribute.man
+++ b/man/XvGetPortAttribute.man
@@ -1,5 +1,5 @@
 .TH XvGetPortAttribute 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvGetPortAttribute.man,v 1.7 2003/05/29 21:48:05 herrb Exp $
+.\" $XFree86: xc/doc/man/Xv/XvGetPortAttribute.man,v 1.6 2001/01/27 18:20:35 dawes Exp $
 .SH Name
 XvGetPortAttribute \- return current port attribute value
 .\"
diff --git a/man/XvGetStill.man b/man/XvGetStill.man
index 5496bf1..f7b4839 100644
--- a/man/XvGetStill.man
+++ b/man/XvGetStill.man
@@ -1,5 +1,5 @@
 .TH XvGetStill 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvGetStill.man,v 1.6 2003/05/29 21:48:05 herrb Exp $
+.\" $XFree86: xc/doc/man/Xv/XvGetStill.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvGetStill \- capture a single frame of video from a drawable
 .\"
diff --git a/man/XvGetVideo.man b/man/XvGetVideo.man
index 1b64710..8b65557 100644
--- a/man/XvGetVideo.man
+++ b/man/XvGetVideo.man
@@ -1,5 +1,5 @@
 .TH XvGetVideo 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvGetVideo.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvGetVideo.man,v 1.4 1999/03/02 11:49:14 dawes Exp $
 .SH Name
 XvGetVideo \- capture video from a drawable
 .\"
diff --git a/man/XvGrabPort.man b/man/XvGrabPort.man
index 8f5cb19..aa606c9 100644
--- a/man/XvGrabPort.man
+++ b/man/XvGrabPort.man
@@ -1,5 +1,5 @@
 .TH XvGrabPort 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvGrabPort.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvGrabPort.man,v 1.4 1999/03/02 11:49:14 dawes Exp $
 .SH Name
 XvGrabPort \- lock port for exclusive use by client
 .\"
diff --git a/man/XvPortNotify.man b/man/XvPortNotify.man
index acccf85..e6ca327 100644
--- a/man/XvPortNotify.man
+++ b/man/XvPortNotify.man
@@ -1,5 +1,5 @@
 .TH XvPortNotify 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvPortNotify.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvPortNotify.man,v 1.4 1999/03/02 11:49:15 dawes Exp $
 .SH Name
 XvPortNotify \- event generated when port attributes change
 .\"
diff --git a/man/XvPutStill.man b/man/XvPutStill.man
index 0d8c7c6..cf80b19 100644
--- a/man/XvPutStill.man
+++ b/man/XvPutStill.man
@@ -1,5 +1,5 @@
 .TH XvPutStill 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvPutStill.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvPutStill.man,v 1.4 1999/03/02 11:49:15 dawes Exp $
 .SH Name
 XvPutStill \- write a single frame of video to a drawable
 .\"
diff --git a/man/XvPutVideo.man b/man/XvPutVideo.man
index 22e09ad..f6894cb 100644
--- a/man/XvPutVideo.man
+++ b/man/XvPutVideo.man
@@ -1,5 +1,5 @@
 .TH XvPutVideo 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvPutVideo.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvPutVideo.man,v 1.4 1999/03/02 11:49:15 dawes Exp $
 .SH Name
 XvPutVideo \- write video into a drawable
 .\"
diff --git a/man/XvQueryAdaptors.man b/man/XvQueryAdaptors.man
index 5f060df..88625bd 100644
--- a/man/XvQueryAdaptors.man
+++ b/man/XvQueryAdaptors.man
@@ -1,5 +1,5 @@
 .TH XvQueryAdaptors 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvQueryAdaptors.man,v 1.6 2001/08/17 13:27:50 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvQueryAdaptors.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvQueryAdaptors \- return adaptor information for a screen
 .\"
diff --git a/man/XvQueryBestSize.man b/man/XvQueryBestSize.man
index 031c094..cc6b600 100644
--- a/man/XvQueryBestSize.man
+++ b/man/XvQueryBestSize.man
@@ -1,5 +1,5 @@
 .TH XvQueryBestSize 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvQueryBestSize.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvQueryBestSize.man,v 1.4 1999/03/02 11:49:16 dawes Exp $
 .SH Name
 XvQueryBestSize \- determine the optimum drawable region size
 .\"
diff --git a/man/XvQueryEncodings.man b/man/XvQueryEncodings.man
index 42af2c6..836daab 100644
--- a/man/XvQueryEncodings.man
+++ b/man/XvQueryEncodings.man
@@ -1,5 +1,5 @@
 .TH XvQueryEncodings 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvQueryEncodings.man,v 1.6 2001/01/27 18:20:36 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvQueryEncodings.man,v 1.5 2000/03/21 23:17:20 dawes Exp $
 .SH Name
 XvQueryEncodings \- return list of encodings for an adaptor
 .\"
diff --git a/man/XvQueryExtension.man b/man/XvQueryExtension.man
index 3549f96..6442536 100644
--- a/man/XvQueryExtension.man
+++ b/man/XvQueryExtension.man
@@ -1,5 +1,5 @@
 .TH XvQueryExtension 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvQueryExtension.man,v 1.6 2001/08/17 13:27:50 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvQueryExtension.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvQueryExtension \- return version and release of extension
 .\"
diff --git a/man/XvSelectPortNotify.man b/man/XvSelectPortNotify.man
index 8e0eb89..8c20c5e 100644
--- a/man/XvSelectPortNotify.man
+++ b/man/XvSelectPortNotify.man
@@ -1,5 +1,5 @@
 .TH XvSelectPortNotify 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvSelectPortNotify.man,v 1.6 2001/08/17 13:27:50 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvSelectPortNotify.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvSelectPortNotify \- enable or disable XvPortNotify(3X) events
 .\"
diff --git a/man/XvSelectVideoNotify.man b/man/XvSelectVideoNotify.man
index 26645bf..74e0bed 100644
--- a/man/XvSelectVideoNotify.man
+++ b/man/XvSelectVideoNotify.man
@@ -1,5 +1,5 @@
 .TH XvSelectVideoNotify 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvSelectVideoNotify.man,v 1.6 2001/08/17 13:27:50 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvSelectVideoNotify.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvSelectVideoNotify \- enable or disable VideoNotify events
 .\"
diff --git a/man/XvSetPortAttribute.man b/man/XvSetPortAttribute.man
index f61d682..84a6a4e 100644
--- a/man/XvSetPortAttribute.man
+++ b/man/XvSetPortAttribute.man
@@ -1,5 +1,5 @@
 .TH XvSetPortAttribute 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvSetPortAttribute.man,v 1.7 2001/08/17 13:27:50 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvSetPortAttribute.man,v 1.6 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvSetPortAttribute \- sets an attribute of a video port 
 .\"
diff --git a/man/XvStopVideo.man b/man/XvStopVideo.man
index c5e188b..8572ab6 100644
--- a/man/XvStopVideo.man
+++ b/man/XvStopVideo.man
@@ -1,5 +1,5 @@
 .TH XvStopVideo 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvStopVideo.man,v 1.6 2001/08/17 13:27:50 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvStopVideo.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvStopVideo \- stop active video 
 .\"
diff --git a/man/XvUngrabPort.man b/man/XvUngrabPort.man
index 3e6cdb1..8a332a8 100644
--- a/man/XvUngrabPort.man
+++ b/man/XvUngrabPort.man
@@ -1,5 +1,5 @@
 .TH XvUngrabPort 3X __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvUngrabPort.man,v 1.6 2001/08/17 13:27:50 dawes Exp $
+.\" $XFree86: xc/doc/man/Xv/XvUngrabPort.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvUngrabPort \- release port grabbed for video operation
 .\"
diff --git a/man/XvVideoNotify.man b/man/XvVideoNotify.man
index 9525007..c15db9b 100644
--- a/man/XvVideoNotify.man
+++ b/man/XvVideoNotify.man
@@ -1,5 +1,5 @@
 .TH XvVideoNotify 3X  __vendorversion__
-.\" $XFree86: xc/doc/man/Xv/XvVideoNotify.man,v 1.6 2003/05/29 21:48:05 herrb Exp $
+.\" $XFree86: xc/doc/man/Xv/XvVideoNotify.man,v 1.5 2001/01/27 18:20:36 dawes Exp $
 .SH Name
 XvVideoNotify \- event generated for video processing
 .\"
diff --git a/src/Xv.c b/src/Xv.c
index b1d0791..78ca573 100644
--- a/src/Xv.c
+++ b/src/Xv.c
@@ -21,7 +21,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */
+/* $XFree86: xc/lib/Xv/Xv.c,v 1.17 2003/04/28 16:56:27 dawes Exp $ */
+/* $XdotOrg: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */
 /*
 ** File: 
 **
diff --git a/src/Xvlibint.h b/src/Xvlibint.h
index 2cec968..501a211 100644
--- a/src/Xvlibint.h
+++ b/src/Xvlibint.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.6 2002/10/16 00:37:33 dawes Exp $ */
+/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.5 2001/07/25 15:04:53 dawes Exp $ */
 
 #ifndef XVLIBINT_H
 #define XVLIBINT_H