X-Git-Url: https://git.piment-noir.org/?p=deb_ffmpeg.git;a=blobdiff_plain;f=ffmpeg%2Flibavcodec%2Fwebvttdec.c;fp=ffmpeg%2Flibavcodec%2Fwebvttdec.c;h=1284a172c43af636ea2504eec27cd0c838cfdc8f;hp=6b86bedbe98f7cd995c44b7547926cbdc992a917;hb=f6fa7814ccfe3e76514b36cf04f5cd3cb657c8cf;hpb=2ba45a602cbfa7b771effba9b11bb4245c21bc00

diff --git a/ffmpeg/libavcodec/webvttdec.c b/ffmpeg/libavcodec/webvttdec.c
index 6b86bed..1284a17 100644
--- a/ffmpeg/libavcodec/webvttdec.c
+++ b/ffmpeg/libavcodec/webvttdec.c
@@ -67,13 +67,13 @@ static int webvtt_event_to_ass(AVBPrint *buf, const char *p)
             av_bprint_chars(buf, *p, 1);
         p++;
     }
-    av_bprintf(buf, "\r\n");
     return 0;
 }
 
 static int webvtt_decode_frame(AVCodecContext *avctx,
                                void *data, int *got_sub_ptr, AVPacket *avpkt)
 {
+    int ret = 0;
     AVSubtitle *sub = data;
     const char *ptr = avpkt->data;
     AVBPrint buf;
@@ -83,10 +83,12 @@ static int webvtt_decode_frame(AVCodecContext *avctx,
         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;
-        ff_ass_add_rect(sub, buf.str, ts_start, ts_duration, 0);
+        ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration);
     }
-    *got_sub_ptr = sub->num_rects > 0;
     av_bprint_finalize(&buf, NULL);
+    if (ret < 0)
+        return ret;
+    *got_sub_ptr = sub->num_rects > 0;
     return avpkt->size;
 }