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/fmt-conversion.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'video/fmt-conversion.c') diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index b908837547..371e81c399 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -190,11 +190,8 @@ static const struct { {IMGFMT_VDPAU, PIX_FMT_VDPAU_H264}, #endif - { IMGFMT_VDA, PIX_FMT_VDA_VLD}, - - {IMGFMT_VAAPI, PIX_FMT_VAAPI_VLD}, - {IMGFMT_VAAPI_MPEG2_IDCT, PIX_FMT_VAAPI_IDCT}, - {IMGFMT_VAAPI_MPEG2_MOCO, PIX_FMT_VAAPI_MOCO}, + {IMGFMT_VDA, PIX_FMT_VDA_VLD}, + {IMGFMT_VAAPI, PIX_FMT_VAAPI_VLD}, {0, PIX_FMT_NONE} }; -- cgit v1.2.3