summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-06 13:24:22 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-06 13:24:22 +0000
commit92305cda4243e4aa364418a7ebe93eca3019f77b (patch)
tree43b7cf2d275001e33afc485d2a4e77b2b1f853a5
parentf45bb4f8994bbfca672fe95144c236e2a02513dc (diff)
merge XFree86 4.3.99.901 (RC1) from vendor branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
-rw-r--r--src/Xv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Xv.c b/src/Xv.c
index 381cdb7..c79ded9 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.17 2003/04/28 16:56:27 dawes Exp $ */
+/* $XFree86: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */
+/* $XdotOrg: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */
/*
** File:
**
@@ -395,6 +396,7 @@ XvQueryEncodings(
*p_nEncodings = rep.num_encodings;
*p_pEncodings = pes;
+ Xfree(buffer);
UnlockDisplay(dpy);
SyncHandle();