Commit 4360c6ff authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6b9b42cc'

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

Conflicts:
	libavfilter/vf_drawtext.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4a39d4c6 6b9b42cc
...@@ -52,6 +52,7 @@ ...@@ -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, ...@@ -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)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment