[FFmpeg-cvslog] vf_drawtext: always use expanded_text as we always support strftime() now and dont depend on localtime_r() anymore

Michael Niedermayer git at videolan.org
Mon Sep 5 23:15:03 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  5 23:01:49 2011 +0200| [845383c358a8c5d8e24e43f6743ec435d2dd3f42] | committer: Michael Niedermayer

vf_drawtext: always use expanded_text as we always support strftime() now and dont depend on localtime_r() anymore

Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/vf_drawtext.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index b368621..1ef8e69 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -520,7 +520,7 @@ static inline int is_newline(uint32_t c)
 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 = HAVE_LOCALTIME_R ? dtext->expanded_text : dtext->text;
+    char *text = dtext->expanded_text;
     uint32_t code = 0;
     int i;
     uint8_t *p;



More information about the ffmpeg-cvslog mailing list