diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:38:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:38:59 +0100 |
| commit | a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3 (patch) | |
| tree | fb5114ebcffba281026acf7503aba6aa8212da8b /libavcodec/vaapi_h264.c | |
| parent | 4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55 (diff) | |
| parent | 066aafced4dc6c7c9e7b37082635472249f1e93e (diff) | |
| download | ffmpeg-a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3.tar.gz | |
Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'
* commit '066aafced4dc6c7c9e7b37082635472249f1e93e':
h264: move direct_spatial_mv_pred into the per-slice context
Conflicts:
libavcodec/h264_mvpred.h
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 ccff1c6069..ed776e5324 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; |