diff options
| author | wm4 <wm4@nowhere> | 2014-03-17 18:21:11 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-03-17 18:21:11 +0100 |
| commit | 638950731451cbef616015bd81d411e7cdbb9ff0 (patch) | |
| tree | fe19c24135e89048df777b163474936afe8b2902 /video/img_format.h | |
| parent | 4e70335c2fa3eaea6f8f2d11fb7981f55a582fa5 (diff) | |
| download | mpv-638950731451cbef616015bd81d411e7cdbb9ff0.tar.bz2 mpv-638950731451cbef616015bd81d411e7cdbb9ff0.tar.xz | |
vdpau: remove legacy pixel formats
They were used by ancient libavcodec versions. This also removes the
need to distinguish vdpau image formats at all (since there is only
one), and some code can be simplified.
Diffstat (limited to 'video/img_format.h')
| -rw-r--r-- | video/img_format.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/video/img_format.h b/video/img_format.h index 3707018477..9cf3a60f11 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -252,20 +252,8 @@ enum mp_imgfmt { // Hardware accelerated formats. Plane data points to special data // structures, instead of pixel data. - - IMGFMT_VDPAU, // new decoder API - IMGFMT_VDPAU_MPEG1, // old API - IMGFMT_VDPAU_MPEG2, - IMGFMT_VDPAU_H264, - IMGFMT_VDPAU_WMV3, - IMGFMT_VDPAU_VC1, - IMGFMT_VDPAU_MPEG4, - - IMGFMT_VDPAU_FIRST = IMGFMT_VDPAU, - IMGFMT_VDPAU_LAST = IMGFMT_VDPAU_MPEG4, - + IMGFMT_VDPAU, IMGFMT_VDA, - IMGFMT_VAAPI, @@ -341,11 +329,8 @@ static inline bool IMGFMT_IS_RGB(int fmt) #define IMGFMT_RGB_DEPTH(fmt) (mp_imgfmt_get_desc(fmt).plane_bits) -#define IMGFMT_IS_VDPAU(fmt) \ - (((fmt) >= IMGFMT_VDPAU_FIRST) && ((fmt) <= IMGFMT_VDPAU_LAST)) - #define IMGFMT_IS_HWACCEL(fmt) \ - (IMGFMT_IS_VDPAU(fmt) || ((fmt) == IMGFMT_VAAPI) || ((fmt) == IMGFMT_VDA)) + ((fmt) == IMGFMT_VDPAU || (fmt) == IMGFMT_VAAPI || (fmt) == IMGFMT_VDA) struct mp_imgfmt_entry { |