video/decode: pass parameters directly to hwdec allocate_image callback

Instead of passing AVFrame. This also moves the mysterious logic about
the size of the allocated image to common code, instead of duplicating
it everywhere.

1 files changed, 2 insertions, 6 deletions

diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c
index baa13588c9..7294046bf4 100644
--- a/video/decode/vaapi.c
+++ b/video/decode/vaapi.c
@@ -324,18 +324,14 @@ error:
     return res;
 }
 
-static struct mp_image *allocate_image(struct lavc_ctx *ctx, AVFrame *frame)
+static struct mp_image *allocate_image(struct lavc_ctx *ctx, int format,
+                                       int w, int h)
 {
     struct priv *p = ctx->hwdec_priv;
-    int format = pixfmt2imgfmt(frame->format);
 
     if (!IMGFMT_IS_VAAPI(format))
         return NULL;
 
-    // frame->width/height lie. Using them breaks with non-mod 16 video.
-    int w = ctx->avctx->width;
-    int h = ctx->avctx->height;
-
     if (format != p->format || w != p->w || h != p->h ||
         p->va_context->context_id == VA_INVALID_ID)
     {