[MPlayer-cvslog] r19569 - in trunk: DOCS/man/en/mplayer.1 cfg-common.h libass/ass_mp.c libass/ass_mp.h libmpcodecs/vf_ass.c

[eugeni]

Author: eugeni
Date: Mon Aug 28 17:12:45 2006
New Revision: 19569

Modified:
   trunk/cfg-common.h
   trunk/libass/ass_mp.c
   trunk/libass/ass_mp.h
   trunk/libmpcodecs/vf_ass.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Log:
Add -(no)ass-use-margins option.


Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	(original)
+++ trunk/cfg-common.h	Mon Aug 28 17:12:45 2006
@@ -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},

Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	(original)
+++ trunk/libass/ass_mp.c	Mon Aug 28 17:12:45 2006
@@ -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;

Modified: trunk/libass/ass_mp.h
==============================================================================
--- trunk/libass/ass_mp.h	(original)
+++ trunk/libass/ass_mp.h	Mon Aug 28 17:12:45 2006
@@ -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);
 

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	(original)
+++ trunk/libmpcodecs/vf_ass.c	Mon Aug 28 17:12:45 2006
@@ -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);