summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
commit1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch)
treec5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /libass
parentf2864e9a072f53c38a04dd7c44392521777dc908 (diff)
parent86c9fb2e8930de031807513c9b93d47394d2d2fa (diff)
downloadmpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2
mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz
Merge svn changes up to r29277
Diffstat (limited to 'libass')
-rw-r--r--libass/ass_render.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index fd3a122e9b..9f1686fa96 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1606,7 +1606,7 @@ static void wrap_lines_smart(int max_text_width)
mp_msg(MSGT_ASS, MSGL_DBG2, "forced line break at %d\n", break_at);
}
- if (len >= max_text_width) {
+ if ((len >= max_text_width) && (frame_context.track->WrapStyle != 2)) {
break_type = 1;
break_at = last_space;
if (break_at == -1)