Merge branch 'master' into remove_old_demuxers

Conflicts:
	DOCS/man/en/changes.rst
	DOCS/man/en/options.rst

1 files changed, 1 insertions, 1 deletions

diff --git a/sub/sub.c b/sub/sub.c
index 90b6cfee00..f3feef3c88 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -40,7 +40,7 @@
 #include "video/mp_image_pool.h"
 
 static const struct osd_style_opts osd_style_opts_def = {
-    .font = "Sans",
+    .font = "sans-serif",
     .font_size = 45,
     .color = {255, 255, 255, 255},
     .border_color = {0, 0, 0, 255},