summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-03-13 16:46:37 +0100
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-03-13 17:29:57 +0100
commit7c6754f6b315374b74ee52a816456784c0b1c880 (patch)
tree729de48ad84bb23d6ac3377bf90c5c28e0179dc9
parent9b7863bf49dcf8bf1de9b45ce4e986dfd1cca418 (diff)
h264: fix weighted prediction indicator (SNB).
Implicit weight tables derivation (weighted_bipred_idc == 2) could not be set. Only default weight tables were possible instead of explicit weight tables provided by the codec layer. https://bugs.freedesktop.org/show_bug.cgi?id=40820 Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-rw-r--r--NEWS1
-rw-r--r--src/gen6_mfd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1b4809a..7cefa20 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Copyright (C) 2009-2011 Intel Corporation
Version 1.0.16 - DD.Feb.2012
* Fix VC-1 bitplane buffer size (SNB, IVB)
* Fix VC-1 motion vector modes for Ivy Bridge
+* Fix weighted prediction indicator for Sandy Bridge
* Fix MFX_QM_STATE for H.264 flat scaling lists (IVB)
* Fix and simplify AVC_REF_IDX_STATE setup (ILK, SNB, IVB)
* Fix and simplify first macroblock bit offset calculation (ILK, SNB, IVB)
diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index c47f11b..c6fe1d2 100644
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -708,7 +708,7 @@ gen6_mfd_avc_slice_state(VADriverContextP ctx,
} else {
num_ref_idx_l0 = slice_param->num_ref_idx_l0_active_minus1 + 1;
num_ref_idx_l1 = slice_param->num_ref_idx_l1_active_minus1 + 1;
- weighted_pred_idc = (pic_param->pic_fields.bits.weighted_bipred_idc == 1);
+ weighted_pred_idc = pic_param->pic_fields.bits.weighted_bipred_idc;
}
first_mb_in_slice = slice_param->first_mb_in_slice << mbaff_picture;