From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed, 15 Jun 2011 01:11:26 +0000 (+0800)
Subject: i965_drv_video: fix assertion failure
X-Git-Tag: 1.0_branch~269
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c7e28d5495f08336cfde347f23b9b7d1221d1b7;p=profile%2Fivi%2Fvaapi-intel-driver.git

i965_drv_video: fix assertion failure

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
---

diff --git a/gen6_mfd.c b/gen6_mfd.c
index 9a5ab56..df2c5ab 100644
--- a/gen6_mfd.c
+++ b/gen6_mfd.c
@@ -1182,7 +1182,7 @@ gen6_mfd_mpeg2_decode_init(VADriverContextP ctx,
     if (obj_surface && obj_surface->bo)
         gen6_mfd_context->reference_surface[1].surface_id = pic_param->backward_reference_picture;
     else
-        gen6_mfd_context->reference_surface[1].surface_id = pic_param->forward_reference_picture;
+        gen6_mfd_context->reference_surface[1].surface_id = gen6_mfd_context->reference_surface[0].surface_id;
 
     /* must do so !!! */
     for (i = 2; i < ARRAY_ELEMS(gen6_mfd_context->reference_surface); i++)
@@ -1364,7 +1364,6 @@ gen6_mfd_mpeg2_decode_picture(VADriverContextP ctx,
     gen6_mfd_mpeg2_pic_state(ctx, decode_state, gen6_mfd_context);
     gen6_mfd_mpeg2_qm_state(ctx, decode_state, gen6_mfd_context);
 
-    assert(decode_state->num_slice_params == 1);
     for (j = 0; j < decode_state->num_slice_params; j++) {
         assert(decode_state->slice_params && decode_state->slice_params[j]->buffer);
         slice_param = (VASliceParameterBufferMPEG2 *)decode_state->slice_params[j]->buffer;