From cc1d6071c883e51483acd2d948317cf499b80c20 Mon Sep 17 00:00:00 2001
From: Indrajit Das <indrajit-kumar.das@amd.com>
Date: Wed, 10 Jan 2018 15:13:37 +0530
Subject: [PATCH 3/3] st/va: clear pointers for mpeg2 quantiser matrices

This ensures that invalid pointers are not passed to the driver
in case new matrices are not sent from the upper layers

Signed-off-by: Indrajit Das <indrajit-kumar.das@amd.com>
---
 src/gallium/state_trackers/va/picture.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c
index 20fe750..2179080 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -57,6 +57,11 @@ vlVaBeginPicture(VADriverContextP ctx, VAContextID context_id, VASurfaceID rende
       return VA_STATUS_ERROR_INVALID_CONTEXT;
    }
 
+   if (u_reduce_video_profile(context->templat.profile) == PIPE_VIDEO_FORMAT_MPEG12) {
+      context->desc.mpeg12.intra_matrix = NULL;
+      context->desc.mpeg12.non_intra_matrix = NULL;
+   }
+
    surf = handle_table_get(drv->htab, render_target);
    mtx_unlock(&drv->mutex);
    if (!surf || !surf->buffer)
-- 
2.7.4

