lavc: allow subtitle text format to be ASS without timing

1 files changed, 13 insertions, 1 deletions

diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c
index 0a6875a51a..88fc2411e5 100644
--- a/libavcodec/srtenc.c
+++ b/libavcodec/srtenc.c
@@ -237,18 +237,30 @@ static int encode_frame(AVCodecContext *avctx,
     av_bprint_clear(&s->buffer);
 
     for (i=0; i<sub->num_rects; i++) {
+        const char *ass = sub->rects[i]->ass;
 
         if (sub->rects[i]->type != SUBTITLE_ASS) {
             av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n");
             return AVERROR(ENOSYS);
         }
 
-        dialog = ff_ass_split_dialog(s->ass_ctx, sub->rects[i]->ass, 0, &num);
+        if (!strncmp(ass, "Dialogue: ", 10)) {
+            dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num);
+            // TODO reindent
         for (; dialog && num--; dialog++) {
             s->alignment_applied = 0;
             srt_style_apply(s, dialog->style);
             ff_ass_split_override_codes(cb, s, dialog->text);
         }
+        } else {
+            dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
+            if (!dialog)
+                return AVERROR(ENOMEM);
+            s->alignment_applied = 0;
+            srt_style_apply(s, dialog->style);
+            ff_ass_split_override_codes(cb, s, dialog->text);
+            ff_ass_free_dialog(&dialog);
+        }
     }
 
     if (!av_bprint_is_complete(&s->buffer))