[FFmpeg-cvslog] drawtext: Drop stray guards
Luca Barbato
git at videolan.org
Wed Aug 5 12:15:58 CEST 2015
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Jul 31 13:49:03 2015 +0200| [fe026ba960790a004adfcff33f44f96b05538e5c] | committer: Luca Barbato
drawtext: Drop stray guards
There is a fallback for localtime_r and it is in use already.
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe026ba960790a004adfcff33f44f96b05538e5c
---
libavfilter/vf_drawtext.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 97d44c6..a4d25c2 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -467,10 +467,6 @@ static av_cold int init(AVFilterContext *ctx)
}
s->tabsize *= glyph->advance;
-#if !HAVE_LOCALTIME_R
- av_log(ctx, AV_LOG_WARNING, "strftime() expansion unavailable!\n");
-#endif
-
return 0;
}
@@ -818,7 +814,7 @@ static int draw_glyphs(DrawTextContext *s, AVFrame *frame,
const uint8_t rgbcolor[4], const uint8_t yuvcolor[4],
int x, int y)
{
- char *text = HAVE_LOCALTIME_R ? s->expanded_text : s->text;
+ char *text = s->expanded_text;
uint32_t code = 0;
int i;
uint8_t *p;
More information about the ffmpeg-cvslog
mailing list