diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 13:33:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 13:33:44 +0200 |
| commit | edd110ee4526849da487bb6be9c63fc77cb5a65a (patch) | |
| tree | 4c0b9bd163f24be2ede535cc91dc6382bc006b24 /ffmpeg_opt.c | |
| parent | 247f4d1f181c2801b8321a7ddb88818dc4861155 (diff) | |
| parent | bd2ab27c488ae92c7820efe11d4f53d84e94d58e (diff) | |
| download | ffmpeg-edd110ee4526849da487bb6be9c63fc77cb5a65a.tar.gz | |
Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
avconv: use read_file() for reading the 2pass stats
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 172a2255d1..91100447d1 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1482,9 +1482,9 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in av_dict_set(&ost->encoder_opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE); } else { if (video_enc->flags & CODEC_FLAG_PASS2) { - char *logbuffer; - size_t logbuffer_size; - if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { + char *logbuffer = read_file(logfilename); + + if (!logbuffer) { av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n", logfilename); exit_program(1); |