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:13 +0100 |
| commit | 066aafced4dc6c7c9e7b37082635472249f1e93e (patch) | |
| tree | 86888b90a0078a5fa65a3af3e7ddd07869c7cfc0 /libavcodec/vaapi_h264.c | |
| parent | ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6 (diff) | |
| download | ffmpeg-066aafced4dc6c7c9e7b37082635472249f1e93e.tar.gz | |
h264: move direct_spatial_mv_pred into the per-slice context
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 3787b670ec..6823f6d7c6 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -330,7 +330,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, slice_param->slice_data_bit_offset = get_bits_count(&h->gb) + 8; /* bit buffer started beyond nal_unit_type */ slice_param->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + h->mb_x; slice_param->slice_type = ff_h264_get_slice_type(sl); - slice_param->direct_spatial_mv_pred_flag = sl->slice_type == AV_PICTURE_TYPE_B ? h->direct_spatial_mv_pred : 0; + 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 = h->list_count > 0 ? h->ref_count[0] - 1 : 0; slice_param->num_ref_idx_l1_active_minus1 = h->list_count > 1 ? h->ref_count[1] - 1 : 0; slice_param->cabac_init_idc = h->cabac_init_idc; |