diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:06:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:06:57 +0100 |
| commit | 04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42 (patch) | |
| tree | da717a856506847fcad679c9487714044be1275e /libavcodec/vaapi_h264.c | |
| parent | 7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a (diff) | |
| parent | a9b201cacf85d710b102010cb4baef97f00ea39b (diff) | |
Merge commit 'a9b201cacf85d710b102010cb4baef97f00ea39b'
* commit 'a9b201cacf85d710b102010cb4baef97f00ea39b':
h264: move cabac_init_idc 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index a8f2916ff0..07478c16f0 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -334,7 +334,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, slice_param->direct_spatial_mv_pred_flag = sl->slice_type == AV_PICTURE_TYPE_B ? sl->direct_spatial_mv_pred : 0; slice_param->num_ref_idx_l0_active_minus1 = sl->list_count > 0 ? sl->ref_count[0] - 1 : 0; 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->cabac_init_idc = sl->cabac_init_idc; slice_param->slice_qp_delta = sl->qscale - h->pps.init_qp; 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; |