diff options
| author | wm4 <wm4@nowhere> | 2014-06-18 20:04:59 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-18 20:04:59 +0200 |
| commit | 9accfe04265785b68ebfc50e0fb4dd3ebb62d4c2 (patch) | |
| tree | 51b48de261874cd48e4e29b0a459eebb9b718cae /video/out/gl_video.c | |
| parent | 86e5f15592d2c732c03735f4aa7d6361ee0f20dd (diff) | |
| download | mpv-9accfe04265785b68ebfc50e0fb4dd3ebb62d4c2.tar.bz2 mpv-9accfe04265785b68ebfc50e0fb4dd3ebb62d4c2.tar.xz | |
video/out: fix redrawing with no video frame for some VOs
With the change to merge osd drawing into video frame drawing, some
bogus logic got in: they skipped drawing the OSD if no video frame is
available. This broke --no-video --force-window mode.
Diffstat (limited to 'video/out/gl_video.c')
| -rw-r--r-- | video/out/gl_video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 7306d33ae6..9ba5c54284 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -1532,7 +1532,7 @@ void gl_video_render_frame(struct gl_video *p) if (!p->have_image) { gl->Clear(GL_COLOR_BUFFER_BIT); - return; + goto draw_osd; } // Order of processing: @@ -1594,6 +1594,7 @@ void gl_video_render_frame(struct gl_video *p) debug_check_gl(p, "after video rendering"); +draw_osd: assert(p->osd); osd_draw(p->osd_state, p->osd_rect, p->osd_pts, 0, p->osd->formats, |