aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-02-07 11:49:37 +0200
committerMartin Storsjö <martin@martin.st>2011-10-31 16:29:29 +0200
commit02170990fdb2a05c6eaf5fd449f440ec51c0f822 (patch)
tree8bef187629e410f5d4395af6f8b401603b4e1323 /ffmpeg.c
parent45235d69c271966409cdd3eaa022258c22e04fdb (diff)
downloadffmpeg-02170990fdb2a05c6eaf5fd449f440ec51c0f822.tar.gz
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 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
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);
}