Mercurial > mplayer.hg
comparison libass/ass_render.c @ 28857:cd7f1297d54f
Remove extraneous braces.
author | greg |
---|---|
date | Sun, 08 Mar 2009 15:30:40 +0000 |
parents | b9edcb7200e7 |
children | 7fcc0bf5b27a |
comparison
equal
deleted
inserted
replaced
28856:b9edcb7200e7 | 28857:cd7f1297d54f |
---|---|
444 top = (ay > by) ? ay : by; | 444 top = (ay > by) ? ay : by; |
445 right = ((ax+aw) < (bx+bw)) ? (ax+aw) : (bx+bw); | 445 right = ((ax+aw) < (bx+bw)) ? (ax+aw) : (bx+bw); |
446 bottom = ((ay+ah) < (by+bh)) ? (ay+ah) : (by+bh); | 446 bottom = ((ay+ah) < (by+bh)) ? (ay+ah) : (by+bh); |
447 if ((right <= left) || (bottom <= top)) | 447 if ((right <= left) || (bottom <= top)) |
448 return; | 448 return; |
449 old_left = left-(ax); | 449 old_left = left-ax; |
450 old_top = top-(ay); | 450 old_top = top-ay; |
451 w = right-left; | 451 w = right-left; |
452 h = bottom-top; | 452 h = bottom-top; |
453 cur_left = left-(bx); | 453 cur_left = left-bx; |
454 cur_top = top-(by); | 454 cur_top = top-by; |
455 | 455 |
456 // Query cache | 456 // Query cache |
457 memcpy(&hk.a, last_hash, sizeof(*last_hash)); | 457 memcpy(&hk.a, last_hash, sizeof(*last_hash)); |
458 memcpy(&hk.b, hash, sizeof(*hash)); | 458 memcpy(&hk.b, hash, sizeof(*hash)); |
459 hk.aw = aw; | 459 hk.aw = aw; |