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/webvttdec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libavcodec/webvttdec.c') diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c index 7354588..7b2d175 100644 --- a/libavcodec/webvttdec.c +++ b/libavcodec/webvttdec.c @@ -85,15 +85,12 @@ static int webvtt_decode_frame(AVCodecContext *avctx, int ret = 0; AVSubtitle *sub = data; const char *ptr = avpkt->data; + FFASSDecoderContext *s = avctx->priv_data; AVBPrint buf; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); - if (ptr && avpkt->size > 0 && !webvtt_event_to_ass(&buf, ptr)) { - int ts_start = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100}); - int ts_duration = avpkt->duration != -1 ? - av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1; - ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration); - } + if (ptr && avpkt->size > 0 && !webvtt_event_to_ass(&buf, ptr)) + ret = ff_ass_add_rect(sub, buf.str, s->readorder++, 0, NULL, NULL); av_bprint_finalize(&buf, NULL); if (ret < 0) return ret; @@ -108,4 +105,6 @@ AVCodec ff_webvtt_decoder = { .id = AV_CODEC_ID_WEBVTT, .decode = webvtt_decode_frame, .init = ff_ass_subtitle_header_default, + .flush = ff_ass_decoder_flush, + .priv_data_size = sizeof(FFASSDecoderContext), }; -- cgit v1.1