mpeg2: fix reference surfaces construction (IVB).
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Thu, 15 Mar 2012 13:41:47 +0000 (14:41 +0100)
committerXiang, Haihao <haihao.xiang@intel.com>
Thu, 29 Mar 2012 08:23:49 +0000 (16:23 +0800)
Avoid an assert() since we were assigning a reference surface even
if it did not have any backing store.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit 18212d42c5dfee047094ae67914c2b2b630ad99e)

src/gen7_mfd.c

index 625fea3..26c109b 100644 (file)
@@ -1084,7 +1084,7 @@ gen7_mfd_mpeg2_decode_init(VADriverContextP ctx,
     if (obj_surface && obj_surface->bo)
         gen7_mfd_context->reference_surface[1].surface_id = pic_param->backward_reference_picture;
     else
-        gen7_mfd_context->reference_surface[1].surface_id = pic_param->forward_reference_picture;
+        gen7_mfd_context->reference_surface[1].surface_id = gen7_mfd_context->reference_surface[0].surface_id;
 
     /* must do so !!! */
     for (i = 2; i < ARRAY_ELEMS(gen7_mfd_context->reference_surface); i++)