X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvaapi_mpeg4.c;h=9b283f78655cc396142f96fcedb66cf94b3f4760;hb=004564c930ef60d2f9e8798e820ed7b2a37ba0bd;hp=cac7a5c9a4dba5092c0d17548b19fa3d4dd5043e;hpb=9c56cf09ca6da8b89c3155dc50f75232571d0be7;p=ffmpeg diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index cac7a5c9a4d..9b283f78655 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -21,8 +21,8 @@ */ #include "vaapi_internal.h" -#include "h263.h" #include "internal.h" +#include "h263.h" #include "mpeg4video.h" /** Reconstruct bitstream intra_dc_vlc_thr */ @@ -90,7 +90,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->vop_fcode_forward = s->f_code; pic_param->vop_fcode_backward = s->b_code; pic_param->vop_time_increment_resolution = avctx->framerate.num; - pic_param->num_macroblocks_in_gob = s->mb_width * ff_h263_get_gob_height(s); + pic_param->num_macroblocks_in_gob = s->mb_width * H263_GOB_HEIGHT(s->height); pic_param->num_gobs_in_vop = (s->mb_width * s->mb_height) / pic_param->num_macroblocks_in_gob; pic_param->TRB = s->pb_time; pic_param->TRD = s->pp_time;