From 155ecb2c142b8e1e755124b48f1a8a21c9687ce8 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. Conflicts: video/out/vo.c --- video/out/vo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/video/out/vo.c b/video/out/vo.c index a2c973643c..9fac725c99 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -279,6 +279,8 @@ struct vo *init_best_video_out(struct mpv_global *global, autoprobe: // now try the rest... for (int i = 0; video_out_drivers[i]; i++) { + if (video_out_drivers[i] == &video_out_null) + break; struct vo *vo = vo_create(global, input_ctx, osd, encode_lavc_ctx, (char *)video_out_drivers[i]->name, NULL); if (vo) -- cgit v1.2.3