From 7758c15e95c1cc4b16ca309e0760e51aad423b29 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 20 Aug 2014 21:35:45 +0200 Subject: video: don't assume query_format is thread-safe Although it's probably safe for most VOs, there's no guarantee. --- player/video.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'player/video.c') diff --git a/player/video.c b/player/video.c index ffe24e621c..fd998014d5 100644 --- a/player/video.c +++ b/player/video.c @@ -91,10 +91,8 @@ void update_fps(struct MPContext *mpctx) static void set_allowed_vo_formats(struct vf_chain *c, struct vo *vo) { - for (int fmt = IMGFMT_START; fmt < IMGFMT_END; fmt++) { - c->allowed_output_formats[fmt - IMGFMT_START] = - vo->driver->query_format(vo, fmt); - } + for (int fmt = IMGFMT_START; fmt < IMGFMT_END; fmt++) + c->allowed_output_formats[fmt - IMGFMT_START] = vo_query_format(vo, fmt); } static int try_filter(struct MPContext *mpctx, struct mp_image_params params, @@ -575,7 +573,6 @@ static int update_video(struct MPContext *mpctx, double endpts) } - //bool vo_framedrop = !!mpctx->video_out->driver->flip_page_timed; bool vo_framedrop = !!(mpctx->opts->frame_dropping & 1); int min_frames = vo_framedrop ? 2 : 1; // framedrop needs duration -- cgit v1.2.3