This symbol name clashes with a symbol in gnutls, if linking
statically to that library.
---
avconv.c | 2 +-
cmdutils.c | 2 +-
cmdutils.h | 2 +-
ffmpeg.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/avconv.c b/avconv.c
index f93c9fa..e3b4e80 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);
diff --git a/cmdutils.c b/cmdutils.c
index c158de3..51f617c 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -785,7 +785,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 80b20b8..55a06dd 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -309,7 +309,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);
typedef struct {
int64_t num_faulty_pts; /// Number of incorrect PTS values so far
diff --git a/ffmpeg.c b/ffmpeg.c
index 86b73b2..12d5517 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);
}
--
1.7.3.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
