X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvaapi_h264.c;h=9332aa6f3106ad2446b88dc82852b1b5dd1ee172;hb=1c7f252783aec37e4ff8049476386f63afe91756;hp=c7f9d7bcb416f12e33d6eb00432dce9ba56c7c5a;hpb=362372c46be6f4b885f741271687f2dae6435db9;p=ffmpeg diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index c7f9d7bcb41..9332aa6f310 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -22,7 +22,7 @@ #include "h264dec.h" #include "h264_ps.h" -#include "hwaccel.h" +#include "hwconfig.h" #include "vaapi_decode.h" /** @@ -256,9 +256,6 @@ static int vaapi_h264_start_frame(AVCodecContext *avctx, .log2_max_pic_order_cnt_lsb_minus4 = sps->log2_max_poc_lsb - 4, .delta_pic_order_always_zero_flag = sps->delta_pic_order_always_zero_flag, }, - .num_slice_groups_minus1 = pps->slice_group_count - 1, - .slice_group_map_type = pps->mb_slice_group_map_type, - .slice_group_change_rate_minus1 = 0, /* FMO is not implemented */ .pic_init_qp_minus26 = pps->init_qp - 26, .pic_init_qs_minus26 = pps->init_qs - 26, .chroma_qp_index_offset = pps->chroma_qp_index_offset[0], @@ -388,7 +385,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, return 0; } -AVHWAccel ff_h264_vaapi_hwaccel = { +const AVHWAccel ff_h264_vaapi_hwaccel = { .name = "h264_vaapi", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264,