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 This symbol name clashes with a symbol in gnutls, if linking statically to that library. Signed-off-by: Martin Storsjö --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 86b73b2370..12d55174b8 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2276,7 +2276,7 @@ static int transcode(AVFormatContext **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) { fprintf(stderr, "Error reading log file '%s' for pass-2 encoding\n", logfilename); exit_program(1); } -- cgit v1.2.3