summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-21 19:39:58 +0100
committerwm4 <wm4@nowhere>2015-01-21 19:39:58 +0100
commitc15697477fca133b69cad58ad2d43b94b994f6fd (patch)
treed604dc3850d7d57d53233a930ca4c0cabf4d0f79
parentc0077ac936da31e959c7c5cda1a758dc545e9443 (diff)
downloadmpv-c15697477fca133b69cad58ad2d43b94b994f6fd.tar.bz2
mpv-c15697477fca133b69cad58ad2d43b94b994f6fd.tar.xz
vo: never autoselect vo_null
Same deal as with commit d44b4ccb.
-rw-r--r--video/out/vo.c6
1 files 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;
}