diff options
| author | wm4 <wm4@nowhere> | 2015-01-21 19:39:58 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-01-25 17:00:21 +0900 |
| commit | 155ecb2c142b8e1e755124b48f1a8a21c9687ce8 (patch) | |
| tree | c740985201d82eea43e3ea99eb0e238ad16b7868 | |
| parent | 2a2dc4d73ce00f408ef217d78ee8d80fd6b8511f (diff) | |
| download | mpv-155ecb2c142b8e1e755124b48f1a8a21c9687ce8.tar.bz2 mpv-155ecb2c142b8e1e755124b48f1a8a21c9687ce8.tar.xz | |
vo: never autoselect vo_null
Same deal as with commit d44b4ccb.
Conflicts:
video/out/vo.c
| -rw-r--r-- | video/out/vo.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) |