generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drawtext: Remove the ifdef for localtime_r

Browse Source 
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>
This commit is contained in:
Martin Storsjö 2014-10-24 10:59:34 +03:00
parent 82ee7d0dda
commit 6b9b42cc55
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_drawtext.c
View File

@ -47,6 +47,7 @@
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/time_internal.h"
#include "libavutil/tree.h" #include "libavutil/tree.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "avfilter.h" #include "avfilter.h"
@ -535,8 +536,6 @@ static int dtext_prepare_text(AVFilterContext *ctx)
Glyph dummy = { 0 }; Glyph dummy = { 0 };
int width = ctx->inputs[0]->w; int width = ctx->inputs[0]->w;
int height = ctx->inputs[0]->h; int height = ctx->inputs[0]->h;
#if HAVE_LOCALTIME_R
time_t now = time(0); time_t now = time(0);
struct tm ltime; struct tm ltime;
uint8_t *buf = s->expanded_text; uint8_t *buf = s->expanded_text;
@ -558,7 +557,6 @@ static int dtext_prepare_text(AVFilterContext *ctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
text = s->expanded_text = buf; text = s->expanded_text = buf;
s->expanded_text_size = buf_size; s->expanded_text_size = buf_size;
#endif
if ((len = strlen(text)) > s->nb_positions) { if ((len = strlen(text)) > s->nb_positions) {
FT_Vector *p = av_realloc(s->positions, FT_Vector *p = av_realloc(s->positions,