diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:59:16 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:59:20 +0300 |
| commit | 7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a (patch) | |
| tree | dd2396b97502947a1b8d12bee9918da828d895e9 /libavcodec/vaapi_h264.c | |
| parent | ad6cee117e83711bf57e8dd90472543dbd61b8b8 (diff) | |
| parent | e6c90ce94f1b07f50cea2babf7471af455cca0ff (diff) | |
Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'
* commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff':
h264: move loopfilter parameters into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_h264.c')
| -rw-r--r-- | libavcodec/vaapi_h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index f20d989fb5..a8f2916ff0 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; |