vp9: de-duplicate some functions that are identical between 10/12 bpp.

[ffmpeg] / libavcodec / vaapi_mpeg4.c

diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index cac7a5c9a4dba5092c0d17548b19fa3d4dd5043e..9b283f78655cc396142f96fcedb66cf94b3f4760 100644 (file)
--- 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;