diff options
| author | wm4 <wm4@nowhere> | 2013-11-29 14:19:29 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-29 14:19:29 +0100 |
| commit | 60cd30055812d95aba453bdcb9b316e63fda5a31 (patch) | |
| tree | fb54dd4a2bf445f7a54966c2e6389d0a2f4a9a5a /video/img_format.h | |
| parent | 0d255f07bf46948289a2698a4a7063514d0e1ef9 (diff) | |
| download | mpv-60cd30055812d95aba453bdcb9b316e63fda5a31.tar.bz2 mpv-60cd30055812d95aba453bdcb9b316e63fda5a31.tar.xz | |
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.
Diffstat (limited to 'video/img_format.h')
| -rw-r--r-- | video/img_format.h | 12 |
1 files changed, 1 insertions, 11 deletions
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 { |