Commit 02170990 authored by Martin Storsjö's avatar 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: default avatarMartin Storsjö <martin@martin.st>
parent 45235d69
......@@ -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);
......
......@@ -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");
......
......@@ -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
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment