1 files changed, 10 insertions, 19 deletions

diff --git a/video/out/vo.h b/video/out/vo.h
index 5b05deb79b..3328ab2626 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -47,7 +47,6 @@ enum mp_voctrl {
     VOCTRL_SET_PANSCAN,
     VOCTRL_SET_EQUALIZER,               // struct voctrl_set_equalizer_args
     VOCTRL_GET_EQUALIZER,               // struct voctrl_get_equalizer_args
-    VOCTRL_DUPLICATE_FRAME,
 
     /* for vdpau hardware decoding */
     VOCTRL_HWDEC_DECODER_RENDER,        // pointer to hw state
@@ -104,11 +103,6 @@ struct voctrl_screenshot_args {
     bool has_osd;
 };
 
-typedef struct {
-  int x,y;
-  int w,h;
-} mp_win_t;
-
 #define VO_TRUE		1
 #define VO_FALSE	0
 #define VO_ERROR	-1
@@ -120,6 +114,7 @@ typedef struct {
 #define VOFLAG_HIDDEN		0x10  //< Use to create a hidden window
 #define VOFLAG_STEREO		0x20  //< Use to create a stereo-capable window
 #define VOFLAG_GL_DEBUG         0x40  // Hint to request debug OpenGL context
+#define VOFLAG_ALPHA            0x80  // Hint to request alpha framebuffer
 
 typedef struct vo_info_s
 {
@@ -220,6 +215,12 @@ struct vo_driver {
 
     // List of options to parse into priv struct (requires privsize to be set)
     const struct m_option *options;
+
+    // Help text to print when option parsing fails
+    const char *help_text;
+
+    // Parse these options before parsing user options
+    const char *init_option_string;
 };
 
 struct vo {
@@ -264,19 +265,14 @@ struct vo {
     int xinerama_x;
     int xinerama_y;
 
-    int panscan_x;
-    int panscan_y;
-    float panscan_amount;
-    float monitor_par;
     struct aspect_data {
+        float monitor_par; // out of screen size or from options
         int orgw; // real width
         int orgh; // real height
         int prew; // prescaled width
         int preh; // prescaled height
         float par; // pixel aspect ratio out of orgw/orgh and prew/preh
-        int scrw; // horizontal resolution
-        int scrh; // vertical resolution
-        float asp;
+        float asp; // final video display aspect
     } aspdat;
 
     char *window_title;
@@ -292,7 +288,7 @@ int vo_config(struct vo *vo, uint32_t width, uint32_t height,
 void list_video_out(void);
 
 int vo_control(struct vo *vo, uint32_t request, void *data);
-int vo_draw_image(struct vo *vo, struct mp_image *mpi);
+void vo_queue_image(struct vo *vo, struct mp_image *mpi);
 int vo_redraw_frame(struct vo *vo);
 bool vo_get_want_redraw(struct vo *vo);
 int vo_get_buffered_frame(struct vo *vo, bool eof);
@@ -322,9 +318,4 @@ struct mp_osd_res;
 void vo_get_src_dst_rects(struct vo *vo, struct mp_rect *out_src,
                           struct mp_rect *out_dst, struct mp_osd_res *out_osd);
 
-static inline int aspect_scaling(struct vo *vo)
-{
-  return vo->opts->keepaspect || vo->opts->fs;
-}
-
 #endif /* MPLAYER_VIDEO_OUT_H */