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/vaapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/vaapi.c') diff --git a/video/vaapi.c b/video/vaapi.c index fc6a7819e2..4607be9052 100644 --- a/video/vaapi.c +++ b/video/vaapi.c @@ -405,13 +405,13 @@ struct mp_image *va_surface_wrap(struct va_surface *surface) VASurfaceID va_surface_id_in_mp_image(const struct mp_image *mpi) { - return mpi && IMGFMT_IS_VAAPI(mpi->imgfmt) ? + return mpi && mpi->imgfmt == IMGFMT_VAAPI ? (VASurfaceID)(uintptr_t)mpi->planes[3] : VA_INVALID_ID; } struct va_surface *va_surface_in_mp_image(struct mp_image *mpi) { - return mpi && IMGFMT_IS_VAAPI(mpi->imgfmt) ? + return mpi && mpi->imgfmt == IMGFMT_VAAPI ? (struct va_surface*)mpi->planes[0] : NULL; } -- cgit v1.2.3