diff options
| author | wm4 <wm4@nowhere> | 2015-07-08 14:13:27 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-07-08 14:48:11 +0200 |
| commit | db2268d5b11bfd290251b4aac7045535803f4d96 (patch) | |
| tree | a199c62049139ff7d01acc0a2ea5db964f3d104e /video/vaapi.h | |
| parent | 4781f9e69a074ded4404784138bccc231906b492 (diff) | |
| download | mpv-db2268d5b11bfd290251b4aac7045535803f4d96.tar.bz2 mpv-db2268d5b11bfd290251b4aac7045535803f4d96.tar.xz | |
vaapi: drop compatibility crap and vo_vaapi deinterlacer
Drop libva versions below 0.34.0. These are ancient, so I don't care.
Drop the vo_vaapi deinterlacer as well. With 0.34.0, VPP is always
available, and deinterlacing is done with vf_vavpp.
The vaCreateSurfaces() function changes its signature - actually it did
in 0.34.0 or so, and the <va/va_compat.h> defined a macro to make it use
the old signature.
Diffstat (limited to 'video/vaapi.h')
| -rw-r--r-- | video/vaapi.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/video/vaapi.h b/video/vaapi.h index e3310bcee0..7ed61669f5 100644 --- a/video/vaapi.h +++ b/video/vaapi.h @@ -24,57 +24,6 @@ #include <va/va.h> #include <va/va_x11.h> -/* Compatibility glue with VA-API >= 0.31 */ -#if defined VA_CHECK_VERSION -#if VA_CHECK_VERSION(0,31,0) -#define vaPutImage2 vaPutImage -#define vaAssociateSubpicture2 vaAssociateSubpicture -#endif -#endif - -/* Compatibility glue with VA-API >= 0.34 */ -#if VA_CHECK_VERSION(0,34,0) -#include <va/va_compat.h> -#endif - -/* Compatibility glue with upstream libva */ -#ifndef VA_SDS_VERSION -#define VA_SDS_VERSION 0 -#endif - -/* Compatibility glue with VA-API >= 0.30 */ -#ifndef VA_INVALID_ID -#define VA_INVALID_ID 0xffffffff -#endif -#ifndef VA_FOURCC -#define VA_FOURCC(ch0, ch1, ch2, ch3) \ - ((uint32_t)(uint8_t)(ch0) | \ - ((uint32_t)(uint8_t)(ch1) << 8) | \ - ((uint32_t)(uint8_t)(ch2) << 16) | \ - ((uint32_t)(uint8_t)(ch3) << 24 )) -#endif -#if defined VA_SRC_BT601 && defined VA_SRC_BT709 -# define USE_VAAPI_COLORSPACE 1 -#else -# define USE_VAAPI_COLORSPACE 0 -#endif - -/* Compatibility glue with VA-API >= 0.31.1 */ -#ifndef VA_SRC_SMPTE_240 -#define VA_SRC_SMPTE_240 0x00000040 -#endif -#if defined VA_FILTER_SCALING_MASK -# define USE_VAAPI_SCALING 1 -#else -# define USE_VAAPI_SCALING 0 -#endif - -#ifndef VA_FOURCC_YV12 -#define VA_FOURCC_YV12 0x32315659 -#endif -#ifndef VA_FOURCC_IYUV -#define VA_FOURCC_IYUV 0x56555949 -#endif #ifndef VA_FOURCC_I420 #define VA_FOURCC_I420 VA_FOURCC('I', '4', '2', '0') #endif |