diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:34:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:38:44 +0200 |
| commit | 6cfaa51acbf7f604ff94a3bc6e564855e7813b3a (patch) | |
| tree | 8411b6265cfa2a786f1e582ba323f60042fbc6cd | |
| parent | 449c74f629cb35cfd88b5d2b0d7accf0df225bc0 (diff) | |
| parent | a9b2a51178ea446909015f061ab5df65e3b66bf6 (diff) | |
| download | ffmpeg-6cfaa51acbf7f604ff94a3bc6e564855e7813b3a.tar.gz | |
Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'
* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
avconv_opt: Check localtime() return value
Conflicts:
ffmpeg_opt.c
See: 8e91d9652ea5048d9014e7636e12c6ed4732d7b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 79cb5caa34..69222dea7e 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -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); |