Mercurial > mplayer.hg
changeset 19563:661d6c8a4adb
Add -(no)ass-use-margins option.
| author | eugeni |
|---|---|
| date | Mon, 28 Aug 2006 15:12:45 +0000 |
| parents | ccd7d48e0bab |
| children | 797ee556b564 |
| files | DOCS/man/en/mplayer.1 cfg-common.h libass/ass_mp.c libass/ass_mp.h libmpcodecs/vf_ass.c |
| diffstat | 5 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Mon Aug 28 13:15:54 2006 +0000 +++ b/DOCS/man/en/mplayer.1 Mon Aug 28 15:12:45 2006 +0000 @@ -1703,7 +1703,7 @@ .TP .B \-ass-bottom-margin <value> Adds a black band at the bottom of the frame. -The SSA/ASS renderer will place subtitles there. +The SSA/ASS renderer can place subtitles there (with -ass-use-margins). . .TP .B \-ass-font-scale <value> @@ -1727,7 +1727,12 @@ .TP .B \-ass-top-margin <value> Adds a black band at the top of the frame. -The SSA/ASS renderer will place toptitles there. +The SSA/ASS renderer can place toptitles there (with -ass-use-margins). +. +.TP +.B \-(no)ass-use-margins +Enables/disables placing toptitles and subtitles in black borders when they +are available (default: no). . .TP .B \-dumpjacosub (MPlayer only)
--- a/cfg-common.h Mon Aug 28 13:15:54 2006 +0000 +++ b/cfg-common.h Mon Aug 28 15:12:45 2006 +0000 @@ -303,6 +303,8 @@ {"ass-line-spacing", &ass_line_spacing, CONF_TYPE_FLOAT, CONF_RANGE, -1000, 1000, NULL}, {"ass-top-margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, {"ass-bottom-margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, + {"ass-use-margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noass-use-margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"embeddedfonts", &extract_embedded_fonts, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noembeddedfonts", &extract_embedded_fonts, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"ass-force-style", &ass_force_style_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
--- a/libass/ass_mp.c Mon Aug 28 13:15:54 2006 +0000 +++ b/libass/ass_mp.c Mon Aug 28 15:12:45 2006 +0000 @@ -13,6 +13,7 @@ int ass_bottom_margin = 0; int extract_embedded_fonts = 0; char **ass_force_style_list = NULL; +int ass_use_margins = 0; extern int font_fontconfig; extern char* font_name;
--- a/libass/ass_mp.h Mon Aug 28 13:15:54 2006 +0000 +++ b/libass/ass_mp.h Mon Aug 28 15:12:45 2006 +0000 @@ -10,6 +10,7 @@ extern int ass_bottom_margin; extern int extract_embedded_fonts; extern char **ass_force_style_list; +extern int ass_use_margins; ass_track_t* ass_read_subdata(sub_data* subdata, double fps);
--- a/libmpcodecs/vf_ass.c Mon Aug 28 13:15:54 2006 +0000 +++ b/libmpcodecs/vf_ass.c Mon Aug 28 15:12:45 2006 +0000 @@ -81,6 +81,7 @@ settings.line_spacing = ass_line_spacing; settings.top_margin = ass_top_margin; settings.bottom_margin = ass_bottom_margin; + settings.use_margins = ass_use_margins; settings.aspect = ((double)d_width) / d_height; ass_configure(vf->priv->ass_priv, &settings);