From c0d3fea6000bae5937df6f5744e1dfdd3ab83795 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Sat, 4 Apr 2020 11:45:20 -0600 Subject: [PATCH] lavc/movtextdec: make sure default font name is set Signed-off-by: Philip Langdale --- libavcodec/movtextdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 6c7d93702e8..2481c71af69 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -52,7 +52,7 @@ typedef struct { uint16_t fontID; - char *font; + const char *font; uint8_t fontsize; int color; int back_color; @@ -251,6 +251,8 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) m->ftab_temp = NULL; tx3g_ptr = tx3g_ptr + font_length; } + // In case of broken header, init default font + m->d.font = ASS_DEFAULT_FONT; for (i = 0; i < m->ftab_entries; i++) { if (m->d.fontID == m->ftab[i]->fontID) m->d.font = m->ftab[i]->font; -- 2.39.2