diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-08-22 15:54:56 +0300 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-28 23:26:16 +0200 |
| commit | d5aa8dc88f00ac07f2f35788a230385abd404634 (patch) | |
| tree | 88810e1e576192936a2731e7066fb82882b7a2d5 /libmpcodecs/img_format.h | |
| parent | da374c40de9ca166c04cccc0ce526407f5e58e8e (diff) | |
| download | mpv-d5aa8dc88f00ac07f2f35788a230385abd404634.tar.bz2 mpv-d5aa8dc88f00ac07f2f35788a230385abd404634.tar.xz | |
cleanup: remove XvMC remains, reformat img_format.c
Remove remaining references to XvMC. It was already not supported;
remove references to the imgfmt too. Reformat img_format.c.
Diffstat (limited to 'libmpcodecs/img_format.h')
| -rw-r--r-- | libmpcodecs/img_format.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 61873ad72a..e62ecc4dc1 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -198,14 +198,6 @@ #define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S')) #define IMGFMT_MJPEG (('M')|('J'<<8)|('P'<<16)|('G'<<24)) -// I think that this code could not be used by any other codec/format -#define IMGFMT_XVMC 0x1DC70000 -#define IMGFMT_XVMC_MASK 0xFFFF0000 -#define IMGFMT_IS_XVMC(fmt) (((fmt)&IMGFMT_XVMC_MASK)==IMGFMT_XVMC) -//these are chroma420 -#define IMGFMT_XVMC_MOCO_MPEG2 (IMGFMT_XVMC|0x02) -#define IMGFMT_XVMC_IDCT_MPEG2 (IMGFMT_XVMC|0x82) - // VDPAU specific format. #define IMGFMT_VDPAU 0x1DC80000 #define IMGFMT_VDPAU_MASK 0xFFFF0000 @@ -217,7 +209,7 @@ #define IMGFMT_VDPAU_VC1 (IMGFMT_VDPAU|0x05) #define IMGFMT_VDPAU_MPEG4 (IMGFMT_VDPAU|0x06) -#define IMGFMT_IS_HWACCEL(fmt) (IMGFMT_IS_VDPAU(fmt) || IMGFMT_IS_XVMC(fmt)) +#define IMGFMT_IS_HWACCEL(fmt) IMGFMT_IS_VDPAU(fmt) typedef struct { void* data; |