diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-14 08:39:30 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-14 08:39:30 +0000 |
| commit | 898081f31f99dc35a1602a607a07d1aaff49ac40 (patch) | |
| tree | b2adbc0fd699cc5dc2af141df26130e7874f9369 /xorg-server/hw/xfree86/common/xf86xv.c | |
| parent | c1e91b66cbcf91645f65b9d63f115dcb5a441406 (diff) | |
| parent | 019fc27ce6dc2a1809107be10d4deb80e0fa436b (diff) | |
| download | vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.tar.gz vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.tar.bz2 vcxsrv-898081f31f99dc35a1602a607a07d1aaff49ac40.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86xv.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86xv.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c index 8115075b3..416842473 100644 --- a/xorg-server/hw/xfree86/common/xf86xv.c +++ b/xorg-server/hw/xfree86/common/xf86xv.c @@ -313,6 +313,7 @@ xf86XVFreeAdaptor(XvAdaptorPtr pAdaptor) int i;
free(pAdaptor->name);
+ pAdaptor->name = NULL;
if(pAdaptor->pEncodings) {
XvEncodingPtr pEncode = pAdaptor->pEncodings;
@@ -320,9 +321,11 @@ xf86XVFreeAdaptor(XvAdaptorPtr pAdaptor) for(i = 0; i < pAdaptor->nEncodings; i++, pEncode++)
free(pEncode->name);
free(pAdaptor->pEncodings);
+ pAdaptor->pEncodings = NULL;
}
free(pAdaptor->pFormats);
+ pAdaptor->pFormats = NULL;
if(pAdaptor->pPorts) {
XvPortPtr pPort = pAdaptor->pPorts;
@@ -341,18 +344,22 @@ xf86XVFreeAdaptor(XvAdaptorPtr pAdaptor) }
}
free(pAdaptor->pPorts);
+ pAdaptor->pPorts = NULL;
}
- if(pAdaptor->nAttributes) {
+ if(pAdaptor->pAttributes) {
XvAttributePtr pAttribute = pAdaptor->pAttributes;
for(i = 0; i < pAdaptor->nAttributes; i++, pAttribute++)
free(pAttribute->name);
free(pAdaptor->pAttributes);
+ pAdaptor->pAttributes = NULL;
}
free(pAdaptor->pImages);
free(pAdaptor->devPriv.ptr);
+ pAdaptor->pImages = NULL;
+ pAdaptor->devPriv.ptr = NULL;
}
static Bool
|