[FFmpeg-cvslog] cmdutils: Rename read_file to cmdutils_read_file

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Feb  7 11:49:37 2011 +0200| [02170990fdb2a05c6eaf5fd449f440ec51c0f822] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02170990fdb2a05c6eaf5fd449f440ec51c0f822
---

 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);
                     }