RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6' 

* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
  drawtext: Remove the ifdef for localtime_r

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-26 03:12:37 +01:00
parent 4a39d4c65a 6b9b42cc55
commit 4360c6ff61
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_drawtext.c
View File

@ -52,6 +52,7 @@
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/timecode.h" #include "libavutil/timecode.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"
@ -843,13 +844,6 @@ static int func_metadata(AVFilterContext *ctx, AVBPrint *bp,
return 0; 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, static int func_strftime(AVFilterContext *ctx, AVBPrint *bp,
char *fct, unsigned argc, char **argv, int tag) char *fct, unsigned argc, char **argv, int tag)
{ {