diff options
| author | Martin Storsjö <martin@martin.st> | 2014-10-24 10:59:34 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-10-26 00:14:54 +0300 |
| commit | 6b9b42cc5576e1819ad1e29d98940066fd14b2d6 (patch) | |
| tree | e50752899d1d0ec464af73b7b8901a405c714397 | |
| parent | 82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de (diff) | |
| download | ffmpeg-6b9b42cc5576e1819ad1e29d98940066fd14b2d6.tar.gz | |
drawtext: Remove the ifdef for localtime_r
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ö <martin@martin.st>
| -rw-r--r-- | libavfilter/vf_drawtext.c | 4 |
1 files changed, 1 insertions, 3 deletions
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, |