From: eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 1 Mar 2009 16:01:24 +0000 (+0000)
Subject: With pan-and-scan, keep positioned events in their original positions
X-Git-Tag: 0.9.7~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41071b4849de8e3659520b0ab4b26262203c5714;p=libass

With pan-and-scan, keep positioned events in their original positions
relative to video.

Patch by Grigori Goronzy (greg chown ath cx).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28783 b3059339-0415-0410-9bf9-f77b7e298cf2
---

diff --git a/libass/ass_render.c b/libass/ass_render.c
index ead118d..a40adec 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -467,6 +467,10 @@ static int x2scr(double x) {
 	return x*frame_context.orig_width_nocrop / frame_context.track->PlayResX +
 		FFMAX(global_settings->left_margin, 0);
 }
+static int x2scr_pos(double x) {
+	return x*frame_context.orig_width / frame_context.track->PlayResX +
+		global_settings->left_margin;
+}
 /**
  * \brief Mapping between script and screen coordinates
  */
@@ -2014,7 +2018,7 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
 		int base_y = 0;
 		mp_msg(MSGT_ASS, MSGL_DBG2, "positioned event at %f, %f\n", render_context.pos_x, render_context.pos_y);
 		get_base_point(bbox, alignment, &base_x, &base_y);
-		device_x = x2scr(render_context.pos_x) - base_x;
+		device_x = x2scr_pos(render_context.pos_x) - base_x;
 		device_y = y2scr(render_context.pos_y) - base_y;
 	}