summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-10-03 17:16:02 +0200
committerwm4 <wm4@nowhere>2016-10-03 17:16:02 +0200
commitabbc8fc84a99a739e2566e4f7e022b3c1bdde1f3 (patch)
treecbc077610779c358ed3c4e1a7b05785ed4ecfbf9 /player/command.c
parent7debdde9b91833e63b800181d8d3aaf3099bdfaa (diff)
downloadmpv-abbc8fc84a99a739e2566e4f7e022b3c1bdde1f3.tar.bz2
mpv-abbc8fc84a99a739e2566e4f7e022b3c1bdde1f3.tar.xz
player: fix previous commit
...
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c9
1 files changed, 7 insertions, 2 deletions
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 },