[FFmpeg-cvslog] lavc/movtextenc: fix unclosed style records

John Stebbins git at videolan.org
Fri Apr 10 19:33:19 EEST 2020


ffmpeg | branch: master | John Stebbins <jstebbins at jetheaddev.com> | Sat Apr  4 14:52:00 2020 -0600| [a129cc9e2942d9185a23726fd88b074e453e859a] | committer: Philip Langdale

lavc/movtextenc: fix unclosed style records

The last record at the end of each dialog was never closed

Signed-off-by: Philip Langdale <philipl at overt.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a129cc9e2942d9185a23726fd88b074e453e859a
---

 libavcodec/movtextenc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c
index 05532cd544..d389111419 100644
--- a/libavcodec/movtextenc.c
+++ b/libavcodec/movtextenc.c
@@ -309,6 +309,12 @@ static void mov_text_color_cb(void *priv, unsigned int color, unsigned int color
      */
 }
 
+static void mov_text_end_cb(void *priv)
+{
+    // End of text, close any open style record
+    mov_text_style_start((MovTextContext*)priv);
+}
+
 static uint16_t utf8_strlen(const char *text, int len)
 {
     uint16_t i = 0, ret = 0;
@@ -352,6 +358,7 @@ static const ASSCodesCallbacks mov_text_callbacks = {
     .new_line = mov_text_new_line_cb,
     .style    = mov_text_style_cb,
     .color    = mov_text_color_cb,
+    .end      = mov_text_end_cb,
 };
 
 static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf,



More information about the ffmpeg-cvslog mailing list