diff options
Diffstat (limited to 'libvo/video_out.h')
| -rw-r--r-- | libvo/video_out.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index a36c56aa90..5c8e10a008 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -64,8 +64,6 @@ enum mp_voctrl { VOCTRL_ONTOP, VOCTRL_ROOTWIN, VOCTRL_BORDER, - VOCTRL_DRAW_EOSD, - VOCTRL_GET_EOSD_RES, // struct mp_eosd_res VOCTRL_SET_DEINTERLACE, VOCTRL_GET_DEINTERLACE, @@ -107,6 +105,8 @@ struct voctrl_screenshot_args { // image data directly. // Is never NULL. (Failure has to be indicated by returning VO_FALSE.) struct mp_image *out_image; + // Whether the VO rendered OSD/subtitles into out_image + bool has_osd; }; typedef struct { @@ -233,6 +233,7 @@ struct vo_driver { struct vo { int config_ok; // Last config call was successful? int config_count; // Total number of successful config calls + int default_caps; // query_format() result for configured video format bool frame_loaded; // Is there a next frame the VO could flip to? struct mp_image *waiting_mpi; @@ -265,12 +266,13 @@ struct vo { int panscan_x; int panscan_y; float panscan_amount; - float monitor_aspect; + float monitor_par; struct aspect_data { 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; @@ -311,7 +313,6 @@ extern int xinerama_x; extern int xinerama_y; extern int vo_grabpointer; -extern int vo_doublebuffering; extern int vo_vsync; extern int vo_fs; extern int vo_fsmode; |