From abbc8fc84a99a739e2566e4f7e022b3c1bdde1f3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 3 Oct 2016 17:16:02 +0200
Subject: [PATCH] player: fix previous commit

...
---
 etc/input.conf       | 4 ++--
 player/command.c     | 9 +++++++--
 player/configfiles.c | 6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/etc/input.conf b/etc/input.conf
index 59ee2886f0..c51d5c7995 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -109,10 +109,10 @@
 #t add sub-pos +1                       #                down
 #v cycle sub-visibility
 # stretch SSA/ASS subtitles with anamorphic videos to match historical
-#V cycle ass-vsfilter-aspect-compat
+#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 ass-style-override "force" "no"
+#u cycle-values sub-ass-style-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 24e79c5b98..b502080ed5 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4046,6 +4046,11 @@ static const struct m_property mp_properties_base[] = {
 
      // conflicts with option
     M_PROPERTY_DEPRECATED_ALIAS("audio-format", "audio-codec-name"),
+
+    M_PROPERTY_DEPRECATED_ALIAS("ass-style-override", "sub-ass-style-override"),
+    M_PROPERTY_DEPRECATED_ALIAS("ass-use-margins", "sub-ass-use-margins"),
+    M_PROPERTY_DEPRECATED_ALIAS("ass-vsfilter-aspect-compat",
+                                "sub-ass-vsfilter-aspect-compat"),
 };
 
 // Each entry describes which properties an event (possibly) changes.
@@ -4298,8 +4303,8 @@ static const struct property_osd_display {
         "${?sub-visibility==yes:visible${?sub==no: (but no subtitles selected)}}" },
     { "sub-forced-only", "Forced sub only" },
     { "sub-scale", "Sub Scale"},
-    { "ass-vsfilter-aspect-compat", "Subtitle VSFilter aspect compat"},
-    { "ass-style-override", "ASS subtitle style override"},
+    { "sub-ass-vsfilter-aspect-compat", "Subtitle VSFilter aspect compat"},
+    { "sub-ass-style-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 },
diff --git a/player/configfiles.c b/player/configfiles.c
index 2ade83db86..d87f83c1f7 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -244,9 +244,9 @@ static const char *const backup_properties[] = {
     "sub-visibility",
     "sub-scale",
     "sub-use-margins",
-    "ass-force-margins",
-    "ass-vsfilter-aspect-compat",
-    "ass-style-override",
+    "sub-ass-force-margins",
+    "sub-ass-vsfilter-aspect-compat",
+    "sub-ass-style-override",
     "ab-loop-a",
     "ab-loop-b",
     "options/video-aspect",