From c15697477fca133b69cad58ad2d43b94b994f6fd Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 21 Jan 2015 19:39:58 +0100 Subject: vo: never autoselect vo_null Same deal as with commit d44b4ccb. --- video/out/vo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/video/out/vo.c b/video/out/vo.c index 53a32a72ed..9ac35796c5 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -276,8 +276,10 @@ struct vo *init_best_video_out(struct mpv_global *global, struct vo_extra *ex) autoprobe: // now try the rest... for (int i = 0; video_out_drivers[i]; i++) { - char *name = (char *)video_out_drivers[i]->name; - struct vo *vo = vo_create(true, global, ex, name, NULL); + const struct vo_driver *driver = video_out_drivers[i]; + if (driver == &video_out_null) + break; + struct vo *vo = vo_create(true, global, ex, (char *)driver->name, NULL); if (vo) return vo; } -- cgit v1.2.3