From 6e481d00bd1af654b055b7815eb52fa56c0531a1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 7 Jun 2017 20:18:25 +0200
Subject: options: fix some missing --sub-ass-style-override renames

The option was renamed not to include "-style", but not all uses were
updated.
---
 etc/input.conf   | 2 +-
 player/command.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/input.conf b/etc/input.conf
index 0e07f33e9e..674f38f72d 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -112,7 +112,7 @@
 #V cycle sub-ass-vsfilter-aspect-compat
 # switch between applying no style overrides to SSA/ASS subtitles, and
 # overriding them almost completely with the normal subtitle style
-#u cycle-values sub-ass-style-override "force" "no"
+#u cycle-values sub-ass-override "force" "no"
 #j cycle sub                            # cycle through subtitles
 #J cycle sub down                       # ...backwards
 #SHARP cycle audio                      # switch audio streams
diff --git a/player/command.c b/player/command.c
index a65a187dd7..af7d4006d7 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4334,7 +4334,7 @@ static const struct property_osd_display {
     { "sub-forced-only", "Forced sub only" },
     { "sub-scale", "Sub Scale"},
     { "sub-ass-vsfilter-aspect-compat", "Subtitle VSFilter aspect compat"},
-    { "sub-ass-style-override", "ASS subtitle style override"},
+    { "sub-ass-override", "ASS subtitle style override"},
     { "vf", "Video filters", .msg = "Video filters:\n${vf}"},
     { "af", "Audio filters", .msg = "Audio filters:\n${af}"},
     { "tv-brightness", "Brightness", .osd_progbar = OSD_BRIGHTNESS },
-- 
cgit v1.2.3