summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-21 15:54:22 +0200
committerwm4 <wm4@nowhere>2012-10-24 21:56:34 +0200
commitf80a32a8ebd1573f1578d707416b07880c1a08c1 (patch)
tree908845c81c04e393ce28beef519f6f6cfedc47ea /libvo/video_out.h
parent0c49ddc818fee8059d764f7fbd25820584f335a3 (diff)
downloadmpv-f80a32a8ebd1573f1578d707416b07880c1a08c1.tar.bz2
mpv-f80a32a8ebd1573f1578d707416b07880c1a08c1.tar.xz
core: do not try to redraw OSD if VO doesn't support OSD
This fixes awkward framestepping when seeking with -vo null while paused (caused because seeking by default draws an OSD bar, and mplayer trying to redraw the OSD in that case; this logic is actually needed with vo_xv). It would have been simpler to just check vo->driver->draw_osd (and leave that callback to NULL for VOs which don't support OSD), but for now try to retain the capability to let VOs decide based on the image format whether to support OSD or not.
Diffstat (limited to 'libvo/video_out.h')
-rw-r--r--libvo/video_out.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h
index 1c48b5fb06..efe3624b52 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -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;