From 60cd30055812d95aba453bdcb9b316e63fda5a31 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 29 Nov 2013 14:19:29 +0100 Subject: vaapi: remove unused hw image formats, simplify PIX_FMT_VDA_VLD and PIX_FMT_VAAPI_VLD were never used anywhere. I'm not sure why they were even added, and they sound like they are just for compatibility with XvMC-style decoding, which sucks anyway. Now that there's only a single vaapi format, remove the IMGFMT_IS_VAAPI() macro. Also get rid of IMGFMT_IS_VDA(), which was unused. --- video/decode/vaapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/decode/vaapi.c') diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c index a27e3cde93..f1a270a7c7 100644 --- a/video/decode/vaapi.c +++ b/video/decode/vaapi.c @@ -212,7 +212,7 @@ static int create_decoder(struct lavc_ctx *ctx) VAStatus status; int res = -1; - assert(IMGFMT_IS_VAAPI(p->format)); + assert(p->format == IMGFMT_VAAPI); destroy_decoder(ctx); @@ -307,7 +307,7 @@ static struct mp_image *allocate_image(struct lavc_ctx *ctx, int format, { struct priv *p = ctx->hwdec_priv; - if (!IMGFMT_IS_VAAPI(format)) + if (format != IMGFMT_VAAPI) return NULL; if (format != p->format || w != p->w || h != p->h || -- cgit v1.2.3