xf86-video-intel: Branch 'xvmc-vld' - src/i965_hwmc.c src/xvmc/xvmc_vld.c

[Nan hai Zou]

 src/i965_hwmc.c     |    1 +
 src/xvmc/xvmc_vld.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 13c730e003e805e19deee0996b2af30f69e54c4d
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Wed Apr 1 15:12:55 2009 +0800

     fix
     1.multiple instance
     2.memory leak

diff --git a/src/i965_hwmc.c b/src/i965_hwmc.c
index 7a5e652..68d908d 100644
--- a/src/i965_hwmc.c
+++ b/src/i965_hwmc.c
@@ -148,6 +148,7 @@ static void destroy_context(ScrnInfoPtr pScrn, XvMCContextPtr context)
     I830Ptr pI830 = I830PTR(pScrn);
     private_context = context->driver_priv;
     free_drm_memory(pScrn, &private_context->static_buffer);
+    free_drm_memory(pScrn, &private_context->blocks);
     if (IS_G4X(pI830))
 	free_drm_memory(pScrn, &private_context->slice);
     Xfree(private_context);
diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c
index 4f95842..204cfb7 100644
--- a/src/xvmc/xvmc_vld.c
+++ b/src/xvmc/xvmc_vld.c
@@ -439,7 +439,7 @@ static void state_base_address()
     OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
     OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
     OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH((0xFFFFF<<12) | BASE_ADDRESS_MODIFY);
+    OUT_BATCH(0 | BASE_ADDRESS_MODIFY);
     ADVANCE_BATCH();
 }