From e6c90ce94f1b07f50cea2babf7471af455cca0ff Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Jan 2015 22:28:46 +0100 Subject: h264: move loopfilter parameters into the per-slice context --- libavcodec/vaapi_h264.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/vaapi_h264.c') diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 6840e6d8e3..2196771d71 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -336,9 +336,9 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, slice_param->num_ref_idx_l1_active_minus1 = sl->list_count > 1 ? sl->ref_count[1] - 1 : 0; slice_param->cabac_init_idc = h->cabac_init_idc; slice_param->slice_qp_delta = sl->qscale - h->pps.init_qp; - slice_param->disable_deblocking_filter_idc = h->deblocking_filter < 2 ? !h->deblocking_filter : h->deblocking_filter; - slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2; - slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2; + slice_param->disable_deblocking_filter_idc = sl->deblocking_filter < 2 ? !sl->deblocking_filter : sl->deblocking_filter; + slice_param->slice_alpha_c0_offset_div2 = sl->slice_alpha_c0_offset / 2; + slice_param->slice_beta_offset_div2 = sl->slice_beta_offset / 2; slice_param->luma_log2_weight_denom = sl->luma_log2_weight_denom; slice_param->chroma_log2_weight_denom = sl->chroma_log2_weight_denom; -- cgit v1.2.3