diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:14 +0100 |
| commit | e6c90ce94f1b07f50cea2babf7471af455cca0ff (patch) | |
| tree | 90a6a210485a743e4d59de27b7094a3d861c8546 /libavcodec/dxva2_h264.c | |
| parent | bd3e460b73dd54a68dc253e010c239cefc8d8d55 (diff) | |
| download | ffmpeg-e6c90ce94f1b07f50cea2babf7471af455cca0ff.tar.gz | |
h264: move loopfilter parameters into the per-slice context
Diffstat (limited to 'libavcodec/dxva2_h264.c')
| -rw-r--r-- | libavcodec/dxva2_h264.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index fcd7b3a1f5..5e84275962 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -232,8 +232,8 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, slice->num_ref_idx_l0_active_minus1 = sl->ref_count[0] - 1; if (sl->list_count > 1) slice->num_ref_idx_l1_active_minus1 = sl->ref_count[1] - 1; - slice->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2; - slice->slice_beta_offset_div2 = h->slice_beta_offset / 2; + slice->slice_alpha_c0_offset_div2 = sl->slice_alpha_c0_offset / 2; + slice->slice_beta_offset_div2 = sl->slice_beta_offset / 2; slice->Reserved8Bits = 0; for (list = 0; list < 2; list++) { @@ -281,10 +281,10 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, if (sl->slice_type == AV_PICTURE_TYPE_B) slice->direct_spatial_mv_pred_flag = sl->direct_spatial_mv_pred; slice->cabac_init_idc = h->pps.cabac ? h->cabac_init_idc : 0; - if (h->deblocking_filter < 2) - slice->disable_deblocking_filter_idc = 1 - h->deblocking_filter; + if (sl->deblocking_filter < 2) + slice->disable_deblocking_filter_idc = 1 - sl->deblocking_filter; else - slice->disable_deblocking_filter_idc = h->deblocking_filter; + slice->disable_deblocking_filter_idc = sl->deblocking_filter; slice->slice_id = h->current_slice - 1; } |