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

Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6' 

* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6':
  wtv: Avoid needlessly calling gmtime twice with the same argument

Conflicts:
	libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-26 02:21:42 +02:00
parent 90bf1e3046 851ace79a3
commit 50697ac5b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/wtvdec.c
View File

@ -389,7 +389,7 @@ static int filetime_to_iso8601(char *buf, int buf_size, int64_t value)
struct tm *tm = gmtime(&t);
if (!tm)
return -1;
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", gmtime(&t));
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
return 0;
}
@ -403,7 +403,7 @@ static int crazytime_to_iso8601(char *buf, int buf_size, int64_t value)
struct tm *tm = gmtime(&t);
if (!tm)
return -1;
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", gmtime(&t));
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
return 0;
}
@ -414,10 +414,10 @@ static int crazytime_to_iso8601(char *buf, int buf_size, int64_t value)
static int oledate_to_iso8601(char *buf, int buf_size, int64_t value)
{
time_t t = (av_int2double(value) - 25569.0) * 86400;
struct tm *result= gmtime(&t);
if (!result)
struct tm *tm= gmtime(&t);
if (!tm)
return -1;
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", result);
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
return 0;
}