diff options
author | Anton Khirnov <anton@khirnov.net> | 2015-06-28 09:45:02 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-07-19 10:37:11 +0300 |
commit | bd2ab27c488ae92c7820efe11d4f53d84e94d58e (patch) | |
tree | eef97a58b304750431aef9302e6c6b36a6568872 /avconv_opt.c | |
parent | 6d5d9246042acb804a652e6fedfb7afe0ca85614 (diff) |
avconv: use read_file() for reading the 2pass stats
Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.
Diffstat (limited to 'avconv_opt.c')
-rw-r--r-- | avconv_opt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/avconv_opt.c b/avconv_opt.c index 86989d66f6..e231f539d2 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -1196,9 +1196,9 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) } ost->logfile = f; } else { - 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); |