aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-02 20:06:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-02 20:06:40 +0100
commitbab09864b423bf177e8af6e465e1a01a241eac62 (patch)
tree509461503210fa9da71c6e3b90456ad40aed2f67
parent013c3eb05cbb58add0650165828d5cbf2e2e5e39 (diff)
downloadffmpeg-bab09864b423bf177e8af6e465e1a01a241eac62.tar.gz
avcodec/jacosubdec: use time_internal.h, simplify code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/jacosubdec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/jacosubdec.c b/libavcodec/jacosubdec.c
index ef999ca43c..2f949564d5 100644
--- a/libavcodec/jacosubdec.c
+++ b/libavcodec/jacosubdec.c
@@ -29,6 +29,7 @@
#include "jacosub.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
+#include "libavutil/time_internal.h"
#undef time
@@ -44,11 +45,7 @@ static int insert_datetime(AVBPrint *dst, const char *in, const char *arg)
time_t now = time(0);
struct tm ltime;
-#if HAVE_LOCALTIME_R
localtime_r(&now, &ltime);
-#else
- ltime = *localtime(&now);
-#endif
strftime(buf, sizeof(buf), arg, &ltime);
av_bprintf(dst, "%s", buf);
return 0;