From 02170990fdb2a05c6eaf5fd449f440ec51c0f822 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 7 Feb 2011 11:49:37 +0200 Subject: cmdutils: Rename read_file to cmdutils_read_file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This symbol name clashes with a symbol in gnutls, if linking statically to that library. Signed-off-by: Martin Storsjö --- avconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'avconv.c') diff --git a/avconv.c b/avconv.c index f93c9fa8d5..e3b4e80c3f 100644 --- a/avconv.c +++ b/avconv.c @@ -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); -- cgit v1.2.3