summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-03-03 12:54:36 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-03-03 12:54:36 +0200
commitafef26425d41f34079698891ea71f59212bdef2c (patch)
tree75e20adc9da5ec5c7e0192aca401663a8cd5aa5b /libvo/video_out.h
parent9f6b8e30d2a844c171a2237b6f5f29595c06ff49 (diff)
downloadmpv-afef26425d41f34079698891ea71f59212bdef2c.tar.bz2
mpv-afef26425d41f34079698891ea71f59212bdef2c.tar.xz
core: hr-seek: fix soft hang with hrseek past EOF
When doing a precise seek video_out->frame_loaded was left to true while frames were being skipped. However vo_get_buffered_frame() always returns success if a frame is already loaded; due to this the EOF detection in update_video() never triggered, and a hr-seek past EOF could cause a soft hang (commands were still processed and it was possible to seek again to exit the loop). This could also happen with Matroska files using ordered chapters if an underlying file was actually shorter than the chapter that was supposed to come from it. Then seeking to a timestamp after the end of the file but before the end of the chapter would trigger the bug. Fix the problem by setting frame_loaded to false when we decide to skip the frame in question.
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 5fac7dd02d..5fde30d153 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -283,6 +283,7 @@ 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, double pts);
int vo_get_buffered_frame(struct vo *vo, bool eof);
+void vo_skip_frame(struct vo *vo);
int vo_draw_frame(struct vo *vo, uint8_t *src[]);
int vo_draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, int x, int y);
void vo_draw_osd(struct vo *vo, struct osd_state *osd);