[FFmpeg-devel] [PATCH 1/2] lavc/ass: don't reset end_display_time if it's already set

[Rodger Combs]

---
 libavcodec/ass.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/ass.c b/libavcodec/ass.c
index 336c308..797b1c1 100644
--- a/libavcodec/ass.c
+++ b/libavcodec/ass.c
@@ -159,7 +159,8 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
     if (!rects)
         goto errnomem;
     sub->rects = rects;
-    sub->end_display_time = FFMAX(sub->end_display_time, 10 * duration);
+    if (!sub->end_display_time)
+        sub->end_display_time = 10 * duration;
     rects[sub->num_rects]       = av_mallocz(sizeof(*rects[0]));
     if (!rects[sub->num_rects])
         goto errnomem;
-- 
2.6.4