mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

In case of several \move or \pos in one line, prefer the first one.

Browse Source 
Patch by Grigori G, greg at chown ath cx.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28473 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2009-02-07 01:13:11 +00:00
parent 4fdc9591b4
commit 98c80613c6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libass/ass_render.c
View File

@ -813,10 +813,12 @@ static char* parse_tag(char* p, double pwr) {
else k = ((double)(t - t1)) / delta_t;
x = k * (x2 - x1) + x1;
y = k * (y2 - y1) + y1;
render_context.pos_x = x;
render_context.pos_y = y;
render_context.detect_collisions = 0;
render_context.evt_type = EVENT_POSITIONED;
if (render_context.evt_type != EVENT_POSITIONED) {
render_context.pos_x = x;
render_context.pos_y = y;
render_context.detect_collisions = 0;
render_context.evt_type = EVENT_POSITIONED;
}
} else if (mystrcmp(&p, "frx")) {
double val;
if (mystrtod(&p, &val)) {
@ -892,10 +894,12 @@ static char* parse_tag(char* p, double pwr) {
v2 = strtol(p, &p, 10);
skip(')');
mp_msg(MSGT_ASS, MSGL_DBG2, "pos(%d, %d)\n", v1, v2);
render_context.evt_type = EVENT_POSITIONED;
render_context.detect_collisions = 0;
render_context.pos_x = v1;
render_context.pos_y = v2;
if (render_context.evt_type != EVENT_POSITIONED) {
render_context.evt_type = EVENT_POSITIONED;
render_context.detect_collisions = 0;
render_context.pos_x = v1;
render_context.pos_y = v2;
}
} else if (mystrcmp(&p, "fad")) {
int a1, a2, a3;
long long t1, t2, t3, t4;