ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Nov 2 20:06:08 2014 +0100| [bab09864b423bf177e8af6e465e1a01a241eac62] | committer: Michael Niedermayer
avcodec/jacosubdec: use time_internal.h, simplify code Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bab09864b423bf177e8af6e465e1a01a241eac62 --- libavcodec/jacosubdec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/jacosubdec.c b/libavcodec/jacosubdec.c index ef999ca..2f94956 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, <ime); -#else - ltime = *localtime(&now); -#endif strftime(buf, sizeof(buf), arg, <ime); av_bprintf(dst, "%s", buf); return 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog