summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.h
diff options
context:
space:
mode:
Diffstat (limited to 'libvo/video_out.h')
-rw-r--r--libvo/video_out.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h
index df27d373fe..a6bd19643f 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -58,11 +58,6 @@ enum mp_voctrl {
VOCTRL_START_SLICE,
- // Vo can be used by xover
- VOCTRL_XOVERLAY_SUPPORT,
- VOCTRL_XOVERLAY_SET_COLORKEY, // mp_colorkey_t
- VOCTRL_XOVERLAY_SET_WIN,
-
VOCTRL_NEWFRAME,
VOCTRL_SKIPFRAME,
VOCTRL_REDRAW_FRAME,
@@ -96,12 +91,6 @@ struct voctrl_get_equalizer_args {
int *valueptr;
};
-// VOCTRL_XOVERLAY_SET_COLORKEY
-typedef struct {
- uint32_t x11; // The raw x11 color
- uint16_t r,g,b;
-} mp_colorkey_t;
-
// VOCTRL_GET_EOSD_RES
typedef struct mp_eosd_res {
int w, h; // screen dimensions, including black borders
@@ -142,13 +131,12 @@ typedef struct {
#define VOFLAG_FLIPPING 0x08
#define VOFLAG_HIDDEN 0x10 //< Use to create a hidden window
#define VOFLAG_STEREO 0x20 //< Use to create a stereo-capable window
-#define VOFLAG_XOVERLAY_SUB_VO 0x10000
typedef struct vo_info_s
{
/* driver name ("Matrox Millennium G200/G400" */
const char *name;
- /* short name (for config strings) ("mga") */
+ /* short name (for config strings) ("vdpau") */
const char *short_name;
/* author ("Aaron Holtzman <aholtzma@ess.engr.uvic.ca>") */
const char *author;