diff options
| -rw-r--r-- | avconv.c | 2 | ||||
| -rw-r--r-- | cmdutils.c | 2 | ||||
| -rw-r--r-- | cmdutils.h | 2 | ||||
| -rw-r--r-- | ffmpeg.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -2241,7 +2241,7 @@ static int transcode_init(OutputFile *output_files, } else { char *logbuffer; size_t logbuffer_size; - if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { + if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n", logfilename); exit_program(1); diff --git a/cmdutils.c b/cmdutils.c index 30104fd6b9..76ec5b665a 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -807,7 +807,7 @@ int read_yesno(void) return yesno; } -int read_file(const char *filename, char **bufptr, size_t *size) +int cmdutils_read_file(const char *filename, char **bufptr, size_t *size) { int ret; FILE *f = fopen(filename, "rb"); diff --git a/cmdutils.h b/cmdutils.h index 6d2e82b4eb..3544cdb9f0 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -323,7 +323,7 @@ int read_yesno(void); * @return 0 in case of success, a negative value corresponding to an * AVERROR error code in case of failure. */ -int read_file(const char *filename, char **bufptr, size_t *size); +int cmdutils_read_file(const char *filename, char **bufptr, size_t *size); /** * Get a file corresponding to a preset file. @@ -2250,7 +2250,7 @@ static int transcode_init(OutputFile *output_files, int nb_output_files, if (codec->flags & CODEC_FLAG_PASS2) { char *logbuffer; size_t logbuffer_size; - if (read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { + if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) { av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n", logfilename); exit_program(1); |