diff options
| author | Clément Bœsch <u@pkh.me> | 2016-01-06 13:43:23 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-02-26 21:49:34 +0100 |
| commit | 29412821241050c846dbceaad4b9752857659977 (patch) | |
| tree | eb42444a7a6bf5d2dc66cdec8c7aa26be32bed99 /libavcodec/assenc.c | |
| parent | 805685fffd3115d3f9260d8df15ef36b6b3b8006 (diff) | |
| download | ffmpeg-streaming-29412821241050c846dbceaad4b9752857659977.zip ffmpeg-streaming-29412821241050c846dbceaad4b9752857659977.tar.gz | |
lavc: allow subtitle text format to be ASS without timing
Diffstat (limited to 'libavcodec/assenc.c')
| -rw-r--r-- | libavcodec/assenc.c | 9 |
1 files changed, 2 insertions, 7 deletions
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); |
