# HG changeset patch
# User reimar
# Date 1352399173 0
# Node ID 317eee237d0f7cbed1afe16cd8a0ecca765cc878
# Parent  4f4a90b80a9ab97d7a0661a909a431e6796a48c8
Support subpos values > 100 that allow the subtitles
to be clipped a bit.

diff -r 4f4a90b80a9a -r 317eee237d0f DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Tue Nov 06 23:09:28 2012 +0000
+++ b/DOCS/man/en/mplayer.1	Thu Nov 08 18:26:13 2012 +0000
@@ -2884,9 +2884,10 @@
 slows them down for time-based ones.
 .
 .TP
-.B \-subpos <0\-100> (useful with \-vf expand)
+.B \-subpos <0\-150> (useful with \-vf expand)
 Specify the position of subtitles on the screen.
 The value is the vertical position of the subtitle in % of the screen height.
+Values larger than 100 allow part of the subtitle to be cut off.
 .
 .TP
 .B \-subwidth <10\-100>
diff -r 4f4a90b80a9a -r 317eee237d0f cfg-common.h
--- a/cfg-common.h	Tue Nov 06 23:09:28 2012 +0000
+++ b/cfg-common.h	Thu Nov 08 18:26:13 2012 +0000
@@ -610,7 +610,7 @@
     {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"subfont", &sub_font_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL},
-    {"subpos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+    {"subpos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 150, NULL},
     {"subalign", &sub_alignment, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
     {"subwidth", &sub_width_p, CONF_TYPE_INT, CONF_RANGE, 10, 100, NULL},
     {"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL},
diff -r 4f4a90b80a9a -r 317eee237d0f sub/sub.c
--- a/sub/sub.c	Tue Nov 06 23:09:28 2012 +0000
+++ b/sub/sub.c	Thu Nov 08 18:26:13 2012 +0000
@@ -979,8 +979,10 @@
 
     if (obj->y < 0)
         obj->y = 0;
+    if (sub_pos <= 100 && obj->y > dys - h)
+        obj->y = FFMAX(dys - h, 0);
     if (obj->y > dys - h)
-        obj->y = dys - h;
+        h = FFMAX(dys - obj->y, 0);
 
     obj->bbox.y2 = obj->y + h;