diff options
author | marha <marha@users.sourceforge.net> | 2013-03-25 10:20:34 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-03-25 10:20:34 +0100 |
commit | 176eab9e8277db1549bfc6c9ae805c4e1858f0b0 (patch) | |
tree | a4c8d2d939aa500304d979377e39316b115a8128 /xorg-server/hw/xfree86/common/xf86xvmc.c | |
parent | 9c17f511266fff48a936633de280f271f0ce0c11 (diff) | |
download | vcxsrv-176eab9e8277db1549bfc6c9ae805c4e1858f0b0.tar.gz vcxsrv-176eab9e8277db1549bfc6c9ae805c4e1858f0b0.tar.bz2 vcxsrv-176eab9e8277db1549bfc6c9ae805c4e1858f0b0.zip |
fontconfig mesa pixman xserver git update 25 Mar 2013
xserver commit 2967391c6d35f03121afa8003e0fb94b62495129
pixman commit d8ac35af1208a4fa4d67f03fee10b5449fb8495a
fontconfig commit b561ff2016ce84eef3c81f16dfb0481be6a13f9b
mesa commit 92b8a37fdfff9e83f39b8885f51ed2f60326ab6a
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86xvmc.c')
-rw-r--r-- | xorg-server/hw/xfree86/common/xf86xvmc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86xvmc.c b/xorg-server/hw/xfree86/common/xf86xvmc.c index 78a32bfe1..3169c054c 100644 --- a/xorg-server/hw/xfree86/common/xf86xvmc.c +++ b/xorg-server/hw/xfree86/common/xf86xvmc.c @@ -158,8 +158,10 @@ xf86XvMCScreenInit(ScreenPtr pScreen, if (!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors))) return FALSE; - if (!dixRegisterPrivateKey(&XF86XvMCScreenKeyRec, PRIVATE_SCREEN, 0)) + if (!dixRegisterPrivateKey(&XF86XvMCScreenKeyRec, PRIVATE_SCREEN, 0)) { + free(pAdapt); return FALSE; + } if (!(pScreenPriv = malloc(sizeof(xf86XvMCScreenRec)))) { free(pAdapt); |