From 6b9b42cc5576e1819ad1e29d98940066fd14b2d6 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 24 Oct 2014 10:59:34 +0300 Subject: drawtext: Remove the ifdef for localtime_r MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If it isn't available in the system, we've got a fallback to the normal localtime function, so normal code can assume it is available as long as time_internal.h is included. Signed-off-by: Martin Storsjö --- libavfilter/vf_drawtext.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavfilter/vf_drawtext.c') diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index d954fdf2cd..54a8847ced 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -47,6 +47,7 @@ #include "libavutil/random_seed.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" +#include "libavutil/time_internal.h" #include "libavutil/tree.h" #include "libavutil/lfg.h" #include "avfilter.h" @@ -535,8 +536,6 @@ static int dtext_prepare_text(AVFilterContext *ctx) Glyph dummy = { 0 }; int width = ctx->inputs[0]->w; int height = ctx->inputs[0]->h; - -#if HAVE_LOCALTIME_R time_t now = time(0); struct tm ltime; uint8_t *buf = s->expanded_text; @@ -558,7 +557,6 @@ static int dtext_prepare_text(AVFilterContext *ctx) return AVERROR(ENOMEM); text = s->expanded_text = buf; s->expanded_text_size = buf_size; -#endif if ((len = strlen(text)) > s->nb_positions) { FT_Vector *p = av_realloc(s->positions, -- cgit v1.2.3