From 29412821241050c846dbceaad4b9752857659977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 6 Jan 2016 13:43:23 +0100 Subject: lavc: allow subtitle text format to be ASS without timing --- libavcodec/assenc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libavcodec/assenc.c') diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index 06aa916..4e9825c 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -60,13 +60,7 @@ static int ass_encode_frame(AVCodecContext *avctx, return -1; } - if (strncmp(ass, "Dialogue: ", 10)) { - av_log(avctx, AV_LOG_ERROR, "AVSubtitle rectangle ass \"%s\"" - " does not look like a SSA markup\n", ass); - return AVERROR_INVALIDDATA; - } - - // TODO: reindent + if (!strncmp(ass, "Dialogue: ", 10)) { if (i > 0) { av_log(avctx, AV_LOG_ERROR, "ASS encoder supports only one " "ASS rectangle field.\n"); @@ -91,6 +85,7 @@ static int ass_encode_frame(AVCodecContext *avctx, snprintf(ass_line, sizeof(ass_line), "%d,%ld,%s", ++s->id, layer, p); ass_line[strcspn(ass_line, "\r\n")] = 0; ass = ass_line; + } len = av_strlcpy(buf+total_len, ass, bufsize-total_len); -- cgit v1.1