diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 03:12:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 03:12:37 +0100 |
| commit | 4360c6ff610cce5ef0fc844c1e0616aea0204f7e (patch) | |
| tree | dc9c90b74f33d6cf69e646209f184d2d250f7135 /libavfilter | |
| parent | 4a39d4c65a72860873daa433eab077ffcff0f913 (diff) | |
| parent | 6b9b42cc5576e1819ad1e29d98940066fd14b2d6 (diff) | |
| download | ffmpeg-4360c6ff610cce5ef0fc844c1e0616aea0204f7e.tar.gz | |
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
drawtext: Remove the ifdef for localtime_r
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_drawtext.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index cf57064355..857dee630b 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -52,6 +52,7 @@ #include "libavutil/random_seed.h" #include "libavutil/parseutils.h" #include "libavutil/timecode.h" +#include "libavutil/time_internal.h" #include "libavutil/tree.h" #include "libavutil/lfg.h" #include "avfilter.h" @@ -843,13 +844,6 @@ static int func_metadata(AVFilterContext *ctx, AVBPrint *bp, return 0; } -#if !HAVE_LOCALTIME_R -static void localtime_r(const time_t *t, struct tm *tm) -{ - *tm = *localtime(t); -} -#endif - static int func_strftime(AVFilterContext *ctx, AVBPrint *bp, char *fct, unsigned argc, char **argv, int tag) { |