summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-12 23:35:01 +0100
committerwm4 <wm4@nowhere>2012-12-12 23:35:34 +0100
commitc3f8c9a58e3028777466ce0d3f56374efb10f968 (patch)
tree2267e7bdd026163888e48690bc01ce0973e02b29 /core
parent69e13388342379a256a4a8e9f5a518fcdce453ab (diff)
downloadmpv-c3f8c9a58e3028777466ce0d3f56374efb10f968.tar.bz2
mpv-c3f8c9a58e3028777466ce0d3f56374efb10f968.tar.xz
options: move -ass-bottom-margin/-ass-top-margin options to vf_sub
These options might be useful sometimes, but they are not that important, and work with vf_sub only. Make them vf_sub sub-options.
Diffstat (limited to 'core')
-rw-r--r--core/cfg-mplayer.h2
-rw-r--r--core/options.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 762c13a2bb..65ebdbb595 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -512,8 +512,6 @@ const m_option_t common_opts[] = {
OPT_MAKE_FLAGS("ass", ass_enabled, 0),
OPT_FLOATRANGE("sub-scale", sub_scale, 0, 0, 100),
OPT_FLOATRANGE("ass-line-spacing", ass_line_spacing, 0, -1000, 1000),
- OPT_INTRANGE("ass-top-margin", ass_top_margin, 0, 0, 2000),
- OPT_INTRANGE("ass-bottom-margin", ass_bottom_margin, 0, 0, 2000),
OPT_MAKE_FLAGS("ass-use-margins", ass_use_margins, 0),
OPT_MAKE_FLAGS("ass-vsfilter-aspect-compat", ass_vsfilter_aspect_compat, 0),
OPT_MAKE_FLAGS("embeddedfonts", use_embedded_fonts, 0),
diff --git a/core/options.h b/core/options.h
index da4449cb11..a45c6d468f 100644
--- a/core/options.h
+++ b/core/options.h
@@ -119,8 +119,6 @@ typedef struct MPOpts {
int sub_gray;
int ass_enabled;
float ass_line_spacing;
- int ass_top_margin;
- int ass_bottom_margin;
int ass_use_margins;
int ass_vsfilter_aspect_compat;
int use_embedded_fonts;