From efc8c709c93875dffa4c4181fa9b56fa6d20d4c7 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 27 Mar 2011 18:32:52 +0200 Subject: [PATCH] drawtext: draw glyphs for the strftime()-expanded text In draw_glyphs(), draw glyphs in dtext->expanded_text rather than in dtext->text. Fix crash if a strftime() sequence is used. --- libavfilter/vf_drawtext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 275135482d..9b6ae7d179 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -498,7 +498,7 @@ static inline void drawbox(AVFilterBufferRef *picref, unsigned int x, unsigned i static int draw_glyphs(DrawTextContext *dtext, AVFilterBufferRef *picref, int width, int height, const uint8_t rgbcolor[4], const uint8_t yuvcolor[4], int x, int y) { - char *text = dtext->text; + char *text = HAVE_LOCALTIME_R ? dtext->expanded_text : dtext->text; uint32_t code = 0; int i; uint8_t *p;