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/img_format.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'video/img_format.h') diff --git a/video/img_format.h b/video/img_format.h index 1cfe4465ec..5abeb9c46a 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -260,11 +260,6 @@ enum mp_imgfmt { IMGFMT_VDA, IMGFMT_VAAPI, - IMGFMT_VAAPI_MPEG2_IDCT, - IMGFMT_VAAPI_MPEG2_MOCO, - - IMGFMT_VAAPI_FIRST = IMGFMT_VAAPI, - IMGFMT_VAAPI_LAST = IMGFMT_VAAPI_MPEG2_MOCO, IMGFMT_END, @@ -342,13 +337,8 @@ static inline bool IMGFMT_IS_RGB(unsigned int fmt) #define IMGFMT_IS_VDPAU(fmt) \ (((fmt) >= IMGFMT_VDPAU_FIRST) && ((fmt) <= IMGFMT_VDPAU_LAST)) -#define IMGFMT_IS_VDA(fmt) (((fmt) == IMGFMT_VDA)) - -#define IMGFMT_IS_VAAPI(fmt) \ - (((fmt) >= IMGFMT_VAAPI_FIRST) && ((fmt) <= IMGFMT_VAAPI_LAST)) - #define IMGFMT_IS_HWACCEL(fmt) \ - (IMGFMT_IS_VDPAU(fmt) || IMGFMT_IS_VAAPI(fmt) || IMGFMT_IS_VDA(fmt)) + (IMGFMT_IS_VDPAU(fmt) || ((fmt) == IMGFMT_VAAPI) || ((fmt) == IMGFMT_VDA)) struct mp_imgfmt_entry { -- cgit v1.2.3