From 458b062d61a92d725cde9363941747a1c6d1e575 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 1 Apr 2010 22:34:22 +0000 Subject: Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading the second pass encoding log file. Originally committed as revision 22769 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 8e603d5193..b7460628e6 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2072,8 +2072,6 @@ static int av_encode(AVFormatContext **output_files, (codec->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2))) { char logfilename[1024]; FILE *f; - int size; - char *logbuffer; snprintf(logfilename, sizeof(logfilename), "%s-%d.log", pass_logfilename_prefix ? pass_logfilename_prefix : DEFAULT_PASS_LOGFILENAME_PREFIX, @@ -2086,23 +2084,12 @@ static int av_encode(AVFormatContext **output_files, } ost->logfile = f; } else { - /* read the log file */ - f = fopen(logfilename, "r"); - if (!f) { - fprintf(stderr, "Cannot read log file '%s' for pass-2 encoding: %s\n", logfilename, strerror(errno)); - av_exit(1); - } - fseek(f, 0, SEEK_END); - size = ftell(f); - fseek(f, 0, SEEK_SET); - logbuffer = av_malloc(size + 1); - if (!logbuffer) { - fprintf(stderr, "Could not allocate log buffer\n"); + char *logbuffer; + size_t logbuffer_size; + if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { + fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename); av_exit(1); } - size = fread(logbuffer, 1, size, f); - fclose(f); - logbuffer[size] = '\0'; codec->stats_in = logbuffer; } } -- cgit v1.2.3