diff options
| author | wm4 <wm4@nowhere> | 2012-10-12 10:17:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-12 11:53:53 +0200 |
| commit | 85d185441acf4691c830db2f40235ac927410d45 (patch) | |
| tree | 211177793cd5d6b399346be661af8e7528f0f411 /defaultopts.c | |
| parent | 65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff) | |
| parent | e1b15dee4c250bf6509594e241eb2856c8d21e0f (diff) | |
| download | mpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2 mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz | |
Merge branch 'input_changes' into master
Conflicts:
DOCS/man/en/vo.rst
etc/input.conf
input/input.c
m_property.c
Diffstat (limited to 'defaultopts.c')
| -rw-r--r-- | defaultopts.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/defaultopts.c b/defaultopts.c index 17cc18a112..c844cd66d8 100644 --- a/defaultopts.c +++ b/defaultopts.c @@ -55,6 +55,7 @@ void set_default_mplayer_options(struct MPOpts *opts) #endif .ass_font_scale = 1, .ass_vsfilter_aspect_compat = 1, + .ass_style_override = 1, .use_embedded_fonts = 1, .lavc_param = { |