diff options
author | Martin Storsjö <martin@martin.st> | 2011-02-07 12:49:37 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2011-10-31 18:29:29 +0400 |
commit | 02170990fdb2a05c6eaf5fd449f440ec51c0f822 (patch) | |
tree | 8bef187629e410f5d4395af6f8b401603b4e1323 /avconv.c | |
parent | 45235d69c271966409cdd3eaa022258c22e04fdb (diff) |
cmdutils: Rename read_file to cmdutils_read_file
This symbol name clashes with a symbol in gnutls, if linking
statically to that library.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2178,7 +2178,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); |