From c61d8c6ce9ffc27320e9e177c1e1123d5f1b5014 Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Thu, 18 Jul 2013 13:13:31 +0800
Subject: [PATCH] va: release VADisplayContext at the end of vaTerminate()

Otherwise it will result in invalid reading in va_TraceEnd()

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9)
Tested-by: Daniel Charles <daniel.charles@intel.com> on ChromiumOS
---
 va/va.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/va/va.c b/va/va.c
index c770f0d..4f3be28 100644
--- a/va/va.c
+++ b/va/va.c
@@ -515,15 +515,15 @@ VAStatus vaTerminate (
   free(old_ctx->vtable_vpp);
   old_ctx->vtable_vpp = NULL;
 
-  if (VA_STATUS_SUCCESS == vaStatus)
-      pDisplayContext->vaDestroy(pDisplayContext);
-
   VA_TRACE_LOG(va_TraceTerminate, dpy);
 
   va_TraceEnd(dpy);
 
   va_FoolEnd(dpy);
 
+  if (VA_STATUS_SUCCESS == vaStatus)
+      pDisplayContext->vaDestroy(pDisplayContext);
+
   return vaStatus;
 }
 
-- 
2.11.0