From 3c1b6875b589f3a40709a889da85b979e34db625 Mon Sep 17 00:00:00 2001 From: "Xiang, Haihao" Date: Wed, 15 Jun 2011 09:11:26 +0800 Subject: [PATCH] i965_drv_video: fix assertion failure Signed-off-by: Xiang, Haihao --- i965_drv_video/gen6_mfd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/i965_drv_video/gen6_mfd.c b/i965_drv_video/gen6_mfd.c index 9a5ab56..df2c5ab 100644 --- a/i965_drv_video/gen6_mfd.c +++ b/i965_drv_video/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; -- 2.7.4