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

Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6' 

* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
  avconv_opt: Check localtime() return value

Conflicts:
	ffmpeg_opt.c

See: 8e91d9652e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-12 22:34:53 +02:00
parent 449c74f629 a9b2a51178
commit 6cfaa51acb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg_opt.c
View File

@ -2438,8 +2438,10 @@ static int opt_vstats(void *optctx, const char *opt, const char *arg)
time_t today2 = time(NULL);
struct tm *today = localtime(&today2);
if (!today)
return AVERROR(errno);
if (!today) { // maybe tomorrow
av_log(NULL, AV_LOG_FATAL, "Unable to get current time: %s\n", strerror(errno));
exit_program(1);
}
snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min,
today->tm_sec);