RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player: fix previous commit 

...
This commit is contained in:
wm4 2016-10-03 17:16:02 +02:00
parent 7debdde9b9
commit abbc8fc84a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/input.conf
View File

@ -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

9
player/command.c
View File

@ -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 },

6
player/configfiles.c
View File

@ -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",